Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[~andy/linux] / security / tomoyo / realpath.c

diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c
index d1e05b0477154447ce7cb75dcdb3cb8e2ed94259..8d95e91c9fc4bdd070b1f29038876cd37cc7c31b 100644 (file)
--- a/security/tomoyo/realpath.c
+++ b/security/tomoyo/realpath.c
@@ -103,7 +103,7 @@ char *tomoyo_realpath_from_path(struct path *path)
                if (!buf)
                        break;
                /* Get better name for socket. */
-               if (dentry->d_sb && dentry->d_sb->s_magic == SOCKFS_MAGIC) {
+               if (dentry->d_sb->s_magic == SOCKFS_MAGIC) {
                        struct inode *inode = dentry->d_inode;
                        struct socket *sock = inode ? SOCKET_I(inode) : NULL;
                        struct sock *sk = sock ? sock->sk : NULL;