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

Commit 77079dbe authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

alpha: PTR_ERR overwrites -EINVAL in syscall osf_mount 



The initial -EINVAL value is overwritten by `retval = PTR_ERR(name)'.  If
this isn't an error pointer and typenr is not 1, 6 or 9, then this retval,
a pointer cast to a long, is returned.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Acked-by: default avatarRichard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 68221908

arch/alpha/kernel/osf_sys.c

+2 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags) 
SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,

		int, flag, void __user *, data)

{

	int retval = -EINVAL;

	int retval;

	char *name;



	name = getname(path);
@@ -379,6 +379,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path, 
		retval = osf_procfs_mount(name, data, flag);

		break;

	default:

		retval = -EINVAL;

		printk("osf_mount(%ld, %x)\n", typenr, flag);

	}

	putname(name);