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().
This commit is contained in:
commit
ca5432010e
|
@ -138,7 +138,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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue