]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sysfs: Don't leak secdata when a sysfs_dirent is freed.
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 4 Nov 2009 10:50:06 +0000 (02:50 -0800)
committerJames Morris <jmorris@namei.org>
Wed, 4 Nov 2009 21:19:18 +0000 (08:19 +1100)
While refreshing my sysfs patches I noticed a leak in the secdata
implementation.  We don't free the secdata when we free the
sysfs dirent.

This is a bug in 2.6.32-rc5 that we really should close.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
fs/sysfs/dir.c

index 5fad489ce5bcde2ab514e3108f112cd5de005f17..e0201837d24459fd466affe53827ee8fbc102cf0 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/completion.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/security.h>
 #include "sysfs.h"
 
 DEFINE_MUTEX(sysfs_mutex);
@@ -285,6 +286,9 @@ void release_sysfs_dirent(struct sysfs_dirent * sd)
                sysfs_put(sd->s_symlink.target_sd);
        if (sysfs_type(sd) & SYSFS_COPY_NAME)
                kfree(sd->s_name);
+       if (sd->s_iattr && sd->s_iattr->ia_secdata)
+               security_release_secctx(sd->s_iattr->ia_secdata,
+                                       sd->s_iattr->ia_secdata_len);
        kfree(sd->s_iattr);
        sysfs_free_ino(sd->s_ino);
        kmem_cache_free(sysfs_dir_cachep, sd);