1 files changed, 28 insertions, 2 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index 6645b7313b33..1858552a6a1a 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -105,6 +105,33 @@ out:
 EXPORT_SYMBOL_GPL(vfs_setxattr);
 
 ssize_t
+xattr_getsecurity(struct inode *inode, const char *name, void *value,
+                        size_t size)
+{
+        void *buffer = NULL;
+        ssize_t len;
+
+        if (!value || !size) {
+                len = security_inode_getsecurity(inode, name, &buffer, false);
+                goto out_noalloc;
+        }
+
+        len = security_inode_getsecurity(inode, name, &buffer, true);
+        if (len < 0)
+                return len;
+        if (size < len) {
+                len = -ERANGE;
+                goto out;
+        }
+        memcpy(value, buffer, len);
+out:
+        security_release_secctx(buffer, len);
+out_noalloc:
+        return len;
+}
+EXPORT_SYMBOL_GPL(xattr_getsecurity);
+
+ssize_t
 vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
 {
         struct inode *inode = dentry->d_inode;
@@ -126,8 +153,7 @@ vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size)
         if (!strncmp(name, XATTR_SECURITY_PREFIX,
                                 XATTR_SECURITY_PREFIX_LEN)) {
                 const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
-                int ret = security_inode_getsecurity(inode, suffix, value,
-                                                     size, error);
+                int ret = xattr_getsecurity(inode, suffix, value, size);
                 /*
                  * Only overwrite the return value if a security module
                  * is actually active.