diff options
| author | James Morris | 2011-06-30 10:43:56 +0200 |
|---|---|---|
| committer | James Morris | 2011-06-30 10:43:56 +0200 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /security/tomoyo/mount.c | |
| parent | TOMOYO: Make several options configurable. (diff) | |
| parent | Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | kernel-qcow2-linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.gz kernel-qcow2-linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.xz kernel-qcow2-linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.zip | |
Merge branch 'linus' into next
Diffstat (limited to 'security/tomoyo/mount.c')
| -rw-r--r-- | security/tomoyo/mount.c | 2 |
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; } |