mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
afs: Fix incorrect error handling in afs_xattr_get_acl()
Fix incorrect error handling in afs_xattr_get_acl() where there appears to
be a redundant assignment before return, but in fact the return should be a
goto to the error handling at the end of the function.
Fixes: 260f082bae
("afs: Get an AFS3 ACL as an xattr")
Addresses-Coverity: ("Unused Value")
Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Joe Perches <joe@perches.com>
This commit is contained in:
parent
a1b879eefc
commit
cc1dd5c85c
@ -71,11 +71,10 @@ static int afs_xattr_get_acl(const struct xattr_handler *handler,
|
||||
if (ret == 0) {
|
||||
ret = acl->size;
|
||||
if (size > 0) {
|
||||
ret = -ERANGE;
|
||||
if (acl->size > size)
|
||||
return -ERANGE;
|
||||
memcpy(buffer, acl->data, acl->size);
|
||||
ret = acl->size;
|
||||
if (acl->size <= size)
|
||||
memcpy(buffer, acl->data, acl->size);
|
||||
else
|
||||
ret = -ERANGE;
|
||||
}
|
||||
kfree(acl);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user