lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths

[sfrench/cifs-2.6.git] / security / apparmor / domain.c

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 91689d34d2811db3fef09381248f1c91ae361439..04a818d5160475d1bfb73a4faef1aeafd45afda4 100644 (file)
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -311,10 +311,9 @@ static int aa_xattrs_match(const struct linux_binprm *bprm,
                           struct aa_profile *profile, unsigned int state)
 {
        int i;
-       ssize_t size;
        struct dentry *d;
        char *value = NULL;
-       int value_size = 0, ret = profile->xattr_count;
+       int size, value_size = 0, ret = profile->xattr_count;
 
        if (!bprm || !profile->xattr_count)
                return 0;