TOMOYO: Fix oops in tomoyo_mount_acl().
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Mon, 13 Jun 2011 04:49:11 +0000 (13:49 +0900)
committerJames Morris <jmorris@namei.org>
Tue, 14 Jun 2011 05:18:42 +0000 (15:18 +1000)
In tomoyo_mount_acl() since 2.6.36, kern_path() was called without checking
dev_name != NULL. As a result, an unprivileged user can trigger oops by issuing
mount(NULL, "/", "ext3", 0, NULL) request.
Fix this by checking dev_name != NULL before calling kern_path(dev_name).

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: stable@kernel.org
Signed-off-by: James Morris <jmorris@namei.org>
security/tomoyo/mount.c

index 162a864dba24f51c55156d0733fcae3a88df2da6..9fc2e15841c96f54edbefb24a96c40405d06bedd 100644 (file)
@@ -138,7 +138,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
        }
        if (need_dev) {
                /* Get mount point or device file. */
-               if (kern_path(dev_name, LOOKUP_FOLLOW, &path)) {
+               if (!dev_name || kern_path(dev_name, LOOKUP_FOLLOW, &path)) {
                        error = -ENOENT;
                        goto out;
                }