diff options
| author | Julia Lawall <julia@diku.dk> | 2009-11-21 12:53:08 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-11-21 13:05:14 -0800 |
| commit | 60d877334f7d9f5f2417ea4a83c1def769286102 (patch) | |
| tree | bf8faa8fd396ac883de21436408a652eed56f9dd /fs/ceph | |
| parent | b19a29af74c09553b9fef95cdf6e9af3df65f544 (diff) | |
| download | op-kernel-dev-60d877334f7d9f5f2417ea4a83c1def769286102.zip op-kernel-dev-60d877334f7d9f5f2417ea4a83c1def769286102.tar.gz | |
fs/ceph: introduce missing kfree
Error handling code following a kmalloc should free the allocated data.
The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@
x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
when != if (...) { <+...x...+> }
(
x->f1 = E
|
(x->f1 == NULL || ...)
|
f(...,x->f1,...)
)
...>
(
return \(0\|<+...x...+>\|ptr\);
|
return@p2 ...;
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c index 1a48a55..04769a3 100644 --- a/fs/ceph/xattr.c +++ b/fs/ceph/xattr.c @@ -655,8 +655,10 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, /* do request */ req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_SETXATTR, USE_AUTH_MDS); - if (IS_ERR(req)) - return PTR_ERR(req); + if (IS_ERR(req)) { + err = PTR_ERR(req); + goto out; + } req->r_inode = igrab(inode); req->r_inode_drop = CEPH_CAP_XATTR_SHARED; req->r_num_caps = 1; |
