Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / ext2 / xattr_security.c

diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index 837abd7..a266127 100644 (file)
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -8,20 +8,22 @@
 #include <linux/fs.h>
 #include <linux/smp_lock.h>
 #include <linux/ext2_fs.h>
+#include <linux/security.h>
 #include "xattr.h"
 
 static size_t
-ext2_xattr_security_list(char *list, struct inode *inode,
-                       const char *name, int name_len)
+ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size,
+                        const char *name, size_t name_len)
 {
        const int prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
+       const size_t total_len = prefix_len + name_len + 1;
 
-       if (list) {
+       if (list && total_len <= list_size) {
                memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);
                memcpy(list+prefix_len, name, name_len);
                list[prefix_len + name_len] = '\0';
        }
-       return prefix_len + name_len + 1;
+       return total_len;
 }
 
 static int
@@ -44,7 +46,28 @@ ext2_xattr_security_set(struct inode *inode, const char *name,
                              value, size, flags);
 }
 
-struct ext2_xattr_handler ext2_xattr_security_handler = {
+int
+ext2_init_security(struct inode *inode, struct inode *dir)
+{
+       int err;
+       size_t len;
+       void *value;
+       char *name;
+
+       err = security_inode_init_security(inode, dir, &name, &value, &len);
+       if (err) {
+               if (err == -EOPNOTSUPP)
+                       return 0;
+               return err;
+       }
+       err = ext2_xattr_set(inode, EXT2_XATTR_INDEX_SECURITY,
+                            name, value, len, 0);
+       kfree(name);
+       kfree(value);
+       return err;
+}
+
+struct xattr_handler ext2_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
        .list   = ext2_xattr_security_list,
        .get    = ext2_xattr_security_get,