diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /security/tomoyo | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
Merge branch 'linus' into next
Diffstat (limited to 'security/tomoyo')
| -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, | |||
| 125 | } | 125 | } |
| 126 | if (need_dev) { | 126 | if (need_dev) { |
| 127 | /* Get mount point or device file. */ | 127 | /* Get mount point or device file. */ |
| 128 | if (kern_path(dev_name, LOOKUP_FOLLOW, &path)) { | 128 | if (!dev_name || kern_path(dev_name, LOOKUP_FOLLOW, &path)) { |
| 129 | error = -ENOENT; | 129 | error = -ENOENT; |
| 130 | goto out; | 130 | goto out; |
| 131 | } | 131 | } |