aboutsummaryrefslogtreecommitdiff
path: root/ubuntu
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2011-02-24 09:40:31 -0800
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:24:05 -0700
commit308a866238c8c11caadd53cf25d7436ab463fd29 (patch)
tree9823a563f426dca8685126c757bc4abd61332e46 /ubuntu
parent9cb5777232a19fcf955206f1386fcc1f8e0fa453 (diff)
UBUNTU: SAUCE: Fix aufs calling of security_path_mknod
BugLink: http://launchpad.net/bugs/724456 The security_path_mknod hook requires an encoded 'dev' for its 'dev' paramet but aufs is calling security_path_mknod with a 'dev' that was already converted by 'new_decode_dev(dev)'. However security_path_mknod and its consumer TOMOYO is expecting 'dev' rather than 'new_decode_dev(dev)'. This will result in TOMOYO doing new_decode_dev(new_decode_dev(dev)) (which is wrong) when security_path_mknod() is called from aufs' vfsub_mknod Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/aufs/vfsub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/aufs/vfsub.c b/ubuntu/aufs/vfsub.c
index 6ce2fd52082..40f6aefefa8 100644
--- a/ubuntu/aufs/vfsub.c
+++ b/ubuntu/aufs/vfsub.c
@@ -276,7 +276,7 @@ int vfsub_mknod(struct inode *dir, struct path *path, int mode, dev_t dev)
d = path->dentry;
path->dentry = d->d_parent;
- err = security_path_mknod(path, d, mode, dev);
+ err = security_path_mknod(path, d, mode, new_encode_dev(dev));
path->dentry = d;
if (unlikely(err))
goto out;