From: Xiubo Li <xiubli@redhat.com>
To: Max Kellermann <max.kellermann@ionos.com>,
idryomov@gmail.com, ceph-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH 1/2] fs/ceph/mds_client: pass cred pointer to ceph_mds_auth_match()
Date: Mon, 25 Nov 2024 08:52:49 +0800 [thread overview]
Message-ID: <32d12a9f-d2c0-45bd-9f9a-e647a2ac7083@redhat.com> (raw)
In-Reply-To: <20241123072121.1897163-1-max.kellermann@ionos.com>
On 11/23/24 15:21, Max Kellermann wrote:
> This eliminates a redundant get_current_cred() call, because
> ceph_mds_check_access() has already obtained this pointer.
>
> As a side effect, this also fixes a reference leak in
> ceph_mds_auth_match(): by omitting the get_current_cred() call, no
> additional cred reference is taken.
>
> Fixes: 596afb0b8933 ("ceph: add ceph_mds_check_access() helper")
> Cc: stable@vger.kernel.org
> Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
> ---
> fs/ceph/mds_client.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 6baec1387f7d..e8a5994de8b6 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -5615,9 +5615,9 @@ void send_flush_mdlog(struct ceph_mds_session *s)
>
> static int ceph_mds_auth_match(struct ceph_mds_client *mdsc,
> struct ceph_mds_cap_auth *auth,
> + const struct cred *cred,
> char *tpath)
> {
> - const struct cred *cred = get_current_cred();
> u32 caller_uid = from_kuid(&init_user_ns, cred->fsuid);
> u32 caller_gid = from_kgid(&init_user_ns, cred->fsgid);
> struct ceph_client *cl = mdsc->fsc->client;
> @@ -5740,7 +5740,7 @@ int ceph_mds_check_access(struct ceph_mds_client *mdsc, char *tpath, int mask)
> for (i = 0; i < mdsc->s_cap_auths_num; i++) {
> struct ceph_mds_cap_auth *s = &mdsc->s_cap_auths[i];
>
> - err = ceph_mds_auth_match(mdsc, s, tpath);
> + err = ceph_mds_auth_match(mdsc, s, cred, tpath);
> if (err < 0) {
> return err;
> } else if (err > 0) {
Good catch.
Reviewed-by: Xiubo Li <xiubli@redhat.com>
next prev parent reply other threads:[~2024-11-25 0:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 7:21 [PATCH 1/2] fs/ceph/mds_client: pass cred pointer to ceph_mds_auth_match() Max Kellermann
2024-11-23 7:21 ` [PATCH 2/2] fs/ceph/mds_client: fix cred leak in ceph_mds_check_access() Max Kellermann
2024-11-25 0:53 ` Xiubo Li
2024-11-25 14:55 ` Ilya Dryomov
2024-11-25 0:52 ` Xiubo Li [this message]
2024-11-25 14:54 ` [PATCH 1/2] fs/ceph/mds_client: pass cred pointer to ceph_mds_auth_match() Ilya Dryomov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32d12a9f-d2c0-45bd-9f9a-e647a2ac7083@redhat.com \
--to=xiubli@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=max.kellermann@ionos.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox