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

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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] SN2: security hole in sn2_ptc_proc_write
parents a744e016 e0c6d97c

arch/ia64/sn/kernel/sn2/sn2_smp.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -512,6 +512,8 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si 
	int cpu;

	int cpu;

	char optstr[64];

	char optstr[64];





	if (count > sizeof(optstr))

		return -EINVAL;

	if (copy_from_user(optstr, user, count))

	if (copy_from_user(optstr, user, count))

		return -EFAULT;

		return -EFAULT;

	optstr[count - 1] = '\0';

	optstr[count - 1] = '\0';