浏览代码

signal: Guard against negative signal numbers in copy_siginfo_from_user32

While fixing an out of bounds array access in known_siginfo_layout
reported by the kernel test robot it became apparent that the same bug
exists in siginfo_layout and affects copy_siginfo_from_user32.

The straight forward fix that makes guards against making this mistake
in the future and should keep the code size small is to just take an
unsigned signal number instead of a signed signal number, as I did to
fix known_siginfo_layout.

Cc: stable@vger.kernel.org
Fixes: cc731525f26a ("signal: Remove kernel interal si_code magic")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Eric W. Biederman 6 年之前
父节点
当前提交
a36700589b
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      include/linux/signal.h
  2. 1 1
      kernel/signal.c

+ 1 - 1
include/linux/signal.h

@@ -40,7 +40,7 @@ enum siginfo_layout {
 	SIL_SYS,
 	SIL_SYS,
 };
 };
 
 
-enum siginfo_layout siginfo_layout(int sig, int si_code);
+enum siginfo_layout siginfo_layout(unsigned sig, int si_code);
 
 
 /*
 /*
  * Define some primitives to manipulate sigset_t.
  * Define some primitives to manipulate sigset_t.

+ 1 - 1
kernel/signal.c

@@ -2879,7 +2879,7 @@ static bool known_siginfo_layout(unsigned sig, int si_code)
 	return false;
 	return false;
 }
 }
 
 
-enum siginfo_layout siginfo_layout(int sig, int si_code)
+enum siginfo_layout siginfo_layout(unsigned sig, int si_code)
 {
 {
 	enum siginfo_layout layout = SIL_KILL;
 	enum siginfo_layout layout = SIL_KILL;
 	if ((si_code > SI_USER) && (si_code < SI_KERNEL)) {
 	if ((si_code > SI_USER) && (si_code < SI_KERNEL)) {