|
@@ -145,11 +145,6 @@ vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- if (inode->i_op->getxattr)
|
|
|
- error = inode->i_op->getxattr(dentry, name, value, size);
|
|
|
- else
|
|
|
- error = -EOPNOTSUPP;
|
|
|
-
|
|
|
if (!strncmp(name, XATTR_SECURITY_PREFIX,
|
|
|
XATTR_SECURITY_PREFIX_LEN)) {
|
|
|
const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
|
|
@@ -158,9 +153,15 @@ vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
|
|
|
* Only overwrite the return value if a security module
|
|
|
* is actually active.
|
|
|
*/
|
|
|
- if (ret != -EOPNOTSUPP)
|
|
|
- error = ret;
|
|
|
+ if (ret == -EOPNOTSUPP)
|
|
|
+ goto nolsm;
|
|
|
+ return ret;
|
|
|
}
|
|
|
+nolsm:
|
|
|
+ if (inode->i_op->getxattr)
|
|
|
+ error = inode->i_op->getxattr(dentry, name, value, size);
|
|
|
+ else
|
|
|
+ error = -EOPNOTSUPP;
|
|
|
|
|
|
return error;
|
|
|
}
|