summaryrefslogtreecommitdiff
path: root/security/tomoyo
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-06-30 12:43:56 +0400
committerJames Morris <jmorris@namei.org>2011-06-30 12:43:56 +0400
commit5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch)
tree9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /security/tomoyo
parent0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff)
parentc017d0d1351f916c0ced3f358afc491fdcf490b4 (diff)
downloadlinux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.xz
Merge branch 'linus' into next
Diffstat (limited to 'security/tomoyo')
-rw-r--r--security/tomoyo/mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
index 8ba28fda4727..0bbba8b67821 100644
--- a/security/tomoyo/mount.c
+++ b/security/tomoyo/mount.c
@@ -125,7 +125,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;
}