Commit 53e6d8d1 authored by Julia Lawall's avatar Julia Lawall Committed by J. Bruce Fields

fs/nfsd/export.c: Adjust error handling code involving auth_domain_put

Once clp is assigned, it never becomes NULL, so we can make a label for it
in the error handling code.  Because the call to path_lookup follows the
call to auth_domain_find, its error handling code should jump to this new
label.

The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r@
expression x,E;
statement S;
position p1,p2,p3;
@@

(
if ((x = auth_domain_find@p1(...)) == NULL || ...) S
|
x = auth_domain_find@p1(...)
... when != x
if (x == NULL || ...) S
)
<...
if@p3 (...) { ... when != auth_domain_put(x)
                  when != if (x) { ... auth_domain_put(x); ...}
    return@p2 ...;
}
...>
(
return x;
|
return 0;
|
x = E
|
E = x
|
auth_domain_put(x)
)

@exists@
position r.p1,r.p2,r.p3;
expression x;
int ret != 0;
statement S;
@@

* x = auth_domain_find@p1(...)
  <...
* if@p3 (...)
  S
  ...>
* return@p2 \(NULL\|ret\);
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent e8b43555
...@@ -1023,7 +1023,7 @@ exp_export(struct nfsctl_export *nxp) ...@@ -1023,7 +1023,7 @@ exp_export(struct nfsctl_export *nxp)
/* Look up the dentry */ /* Look up the dentry */
err = path_lookup(nxp->ex_path, 0, &nd); err = path_lookup(nxp->ex_path, 0, &nd);
if (err) if (err)
goto out_unlock; goto out_put_clp;
err = -EINVAL; err = -EINVAL;
exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL); exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL);
...@@ -1090,9 +1090,9 @@ exp_export(struct nfsctl_export *nxp) ...@@ -1090,9 +1090,9 @@ exp_export(struct nfsctl_export *nxp)
exp_put(exp); exp_put(exp);
if (fsid_key && !IS_ERR(fsid_key)) if (fsid_key && !IS_ERR(fsid_key))
cache_put(&fsid_key->h, &svc_expkey_cache); cache_put(&fsid_key->h, &svc_expkey_cache);
if (clp)
auth_domain_put(clp);
path_put(&nd.path); path_put(&nd.path);
out_put_clp:
auth_domain_put(clp);
out_unlock: out_unlock:
exp_writeunlock(); exp_writeunlock();
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment