From bfd20a5436548132d5db41f532deee249c5cc6b7 Mon Sep 17 00:00:00 2001 From: "cao.leilc" Date: Tue, 3 Nov 2020 09:16:11 +0800 Subject: [PATCH] rgw : catch non int exception Fixes: https://tracker.ceph.com/issues/48034 Signed-off-by: caolei --- src/rgw/rgw_auth.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc index 1602c957e23cd..52455774af39d 100644 --- a/src/rgw/rgw_auth.cc +++ b/src/rgw/rgw_auth.cc @@ -323,10 +323,17 @@ rgw::auth::Strategy::apply(const DoutPrefixProvider *dpp, const rgw::auth::Strat } catch (const int err) { ldpp_dout(dpp, 5) << "applier throwed err=" << err << dendl; return err; + } catch (const std::exception& e) { + ldpp_dout(dpp, 5) << "applier throwed unexpected err: " << e.what() + << dendl; + return -EPERM; } } catch (const int err) { ldpp_dout(dpp, 5) << "auth engine throwed err=" << err << dendl; return err; + } catch (const std::exception& e) { + ldpp_dout(dpp, 5) << "auth engine throwed unexpected err: " << e.what() + << dendl; } /* We never should be here. */ -- 2.39.5