2020-03-03 23:40:25

by Qiujun Huang

Subject: [PATCH] fs/cifs/cifsacl: remove set but not used variable 'rc'

It is set but not used, So can be removed.

Signed-off-by: Qiujun Huang <[email protected]>
---
fs/cifs/cifsacl.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 716574a..1cf3916 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -342,7 +342,6 @@
sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
struct cifs_fattr *fattr, uint sidtype)
{
- int rc;
struct key *sidkey;
char *sidstr;
const struct cred *saved_cred;
@@ -403,7 +402,6 @@
saved_cred = override_creds(root_cred);
sidkey = request_key(&cifs_idmap_key_type, sidstr, "");
if (IS_ERR(sidkey)) {
- rc = -EINVAL;
cifs_dbg(FYI, "%s: Can't map SID %s to a %cid\n",
__func__, sidstr, sidtype == SIDOWNER ? 'u' : 'g');
goto out_revert_creds;
@@ -416,7 +414,6 @@
*/
BUILD_BUG_ON(sizeof(uid_t) != sizeof(gid_t));
if (sidkey->datalen != sizeof(uid_t)) {
- rc = -EIO;
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu)\n",
__func__, sidkey->datalen);
key_invalidate(sidkey);
--
1.8.3.1

2020-03-04 06:23:51

by Steve French

Subject: Re: [PATCH] fs/cifs/cifsacl: remove set but not used variable 'rc'

Isn't it not used because of a potential bug - missing returning an
error in two cases.

If we leave the two lines you removed in - and set rc=0 in its
declaration (and return rc at the end as you originally had suggested)
- doesn't that solve the problem? A minor modification to your first
proposed patch?

On Tue, Mar 3, 2020 at 5:39 PM Qiujun Huang <[email protected]> wrote:
>
> It is set but not used, So can be removed.
>
> Signed-off-by: Qiujun Huang <[email protected]>
> ---
> fs/cifs/cifsacl.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index 716574a..1cf3916 100644
> --- a/fs/cifs/cifsacl.c
> +++ b/fs/cifs/cifsacl.c
> @@ -342,7 +342,6 @@
> sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
> struct cifs_fattr *fattr, uint sidtype)
> {
> - int rc;
> struct key *sidkey;
> char *sidstr;
> const struct cred *saved_cred;
> @@ -403,7 +402,6 @@
> saved_cred = override_creds(root_cred);
> sidkey = request_key(&cifs_idmap_key_type, sidstr, "");
> if (IS_ERR(sidkey)) {
> - rc = -EINVAL;
> cifs_dbg(FYI, "%s: Can't map SID %s to a %cid\n",
> __func__, sidstr, sidtype == SIDOWNER ? 'u' : 'g');
> goto out_revert_creds;
> @@ -416,7 +414,6 @@
> */
> BUILD_BUG_ON(sizeof(uid_t) != sizeof(gid_t));
> if (sidkey->datalen != sizeof(uid_t)) {
> - rc = -EIO;
> cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu)\n",
> __func__, sidkey->datalen);
> key_invalidate(sidkey);
> --
> 1.8.3.1
>


--
Thanks,

Steve

2020-03-04 06:54:57

by Qiujun Huang

Subject: Re: [PATCH] fs/cifs/cifsacl: remove set but not used variable 'rc'

On Wed, Mar 4, 2020 at 2:23 PM Steve French <[email protected]> wrote:
>
> Isn't it not used because of a potential bug - missing returning an
> error in two cases.

I get it, thanks.

>
> If we leave the two lines you removed in - and set rc=0 in its
> declaration (and return rc at the end as you originally had suggested)
> - doesn't that solve the problem? A minor modification to your first
> proposed patch?

ok, I'll send v2.
>
> On Tue, Mar 3, 2020 at 5:39 PM Qiujun Huang <[email protected]> wrote:
> >
> > It is set but not used, So can be removed.
> >
> > Signed-off-by: Qiujun Huang <[email protected]>
> > ---
> > fs/cifs/cifsacl.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> > index 716574a..1cf3916 100644
> > --- a/fs/cifs/cifsacl.c
> > +++ b/fs/cifs/cifsacl.c
> > @@ -342,7 +342,6 @@
> > sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
> > struct cifs_fattr *fattr, uint sidtype)
> > {
> > - int rc;
> > struct key *sidkey;
> > char *sidstr;
> > const struct cred *saved_cred;
> > @@ -403,7 +402,6 @@
> > saved_cred = override_creds(root_cred);
> > sidkey = request_key(&cifs_idmap_key_type, sidstr, "");
> > if (IS_ERR(sidkey)) {
> > - rc = -EINVAL;
> > cifs_dbg(FYI, "%s: Can't map SID %s to a %cid\n",
> > __func__, sidstr, sidtype == SIDOWNER ? 'u' : 'g');
> > goto out_revert_creds;
> > @@ -416,7 +414,6 @@
> > */
> > BUILD_BUG_ON(sizeof(uid_t) != sizeof(gid_t));
> > if (sidkey->datalen != sizeof(uid_t)) {
> > - rc = -EIO;
> > cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu)\n",
> > __func__, sidkey->datalen);
> > key_invalidate(sidkey);
> > --
> > 1.8.3.1
> >
>
>
> --
> Thanks,
>
> Steve