Merge branch 'linus' into next

This commit is contained in:
James Morris 2011-06-30 18:43:56 +10:00
commit 5b944a71a1
813 changed files with 10195 additions and 4643 deletions

View file

@ -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;
}