Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca543201 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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().
parents 4068b00e 4e78c724

security/tomoyo/mount.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}