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

Commit 187cd44e authored by Al Viro's avatar Al Viro
Browse files

sparc: missing checks of __get_user()/__put_user() return values 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9a078802

arch/sparc/kernel/signal32.c

+6 −4
Original line number Diff line number Diff line
@@ -215,8 +215,9 @@ void do_sigreturn32(struct pt_regs *regs) 
	    (((unsigned long) sf) & 3))

		goto segv;



	get_user(pc, &sf->info.si_regs.pc);

	__get_user(npc, &sf->info.si_regs.npc);

	if (get_user(pc, &sf->info.si_regs.pc) ||

	    __get_user(npc, &sf->info.si_regs.npc))

		goto segv;



	if ((pc | npc) & 3)

		goto segv;
@@ -305,8 +306,9 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs) 
	    (((unsigned long) sf) & 3))

		goto segv;



	get_user(pc, &sf->regs.pc);

	__get_user(npc, &sf->regs.npc);

	if (get_user(pc, &sf->regs.pc) || 

	    __get_user(npc, &sf->regs.npc))

		goto segv;



	if ((pc | npc) & 3)

		goto segv;

arch/sparc/kernel/sys_sparc_32.c

+6 −6
Original line number Diff line number Diff line
@@ -184,10 +184,10 @@ sparc_sigaction (int sig, const struct old_sigaction __user *act, 


		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;

		__get_user(new_ka.sa.sa_flags, &act->sa_flags);

		__get_user(mask, &act->sa_mask);

		siginitset(&new_ka.sa.sa_mask, mask);

		new_ka.ka_restorer = NULL;

	}
@@ -202,10 +202,10 @@ sparc_sigaction (int sig, const struct old_sigaction __user *act, 
		 */

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);

		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);

	}



	return ret;