diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-14 14:28:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-14 14:28:38 -0400 |
| commit | ca5432010e45d7f809b441b0c1e85e84b039cd85 (patch) | |
| tree | ddf8754e813e40ecaa78bcc9ea4c317fc81f9bc1 | |
| parent | 4068b00e9d0542653b26c04dcf05ab0c80bbbbb2 (diff) | |
| parent | 4e78c724d47e2342aa8fde61f6b8536f662f795f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
TOMOYO: Fix oops in tomoyo_mount_acl().
| -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 162a864dba24..9fc2e15841c9 100644 --- a/security/tomoyo/mount.c +++ b/security/tomoyo/mount.c | |||
| @@ -138,7 +138,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, | |||
| 138 | } | 138 | } |
| 139 | if (need_dev) { | 139 | if (need_dev) { |
| 140 | /* Get mount point or device file. */ | 140 | /* Get mount point or device file. */ |
| 141 | if (kern_path(dev_name, LOOKUP_FOLLOW, &path)) { | 141 | if (!dev_name || kern_path(dev_name, LOOKUP_FOLLOW, &path)) { |
| 142 | error = -ENOENT; | 142 | error = -ENOENT; |
| 143 | goto out; | 143 | goto out; |
| 144 | } | 144 | } |