From: Roland McGrath <roland@redhat.com>
Date: Wed, 2 Feb 2005 04:40:11 +0000 (+0000)
Subject: 2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>
X-Git-Tag: v4.5.18~443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe6b352f8d5367521685c7ea52016c544fd9d2fe;p=strace

2004-12-19  Dmitry V. Levin  <ldv@altlinux.org>

	* syscall.c (qual_signal): Check bounds for numeric signal names.
	Fix parser of symbolic signal names.
	Fix return code, as required by qualify() function.
	* syscall.c (qual_desc): Check bounds for descriptor number.
	* syscall.c (qual_syscall): Correct return code, to be consistent
	with qualify() and other qual_* functions.
	Fixes RH#143362.
---

diff --git a/syscall.c b/syscall.c
index 524171c5..a02b03cf 100644
--- a/syscall.c
+++ b/syscall.c
@@ -289,15 +289,15 @@ qual_syscall(s, opt, not)
 	int not;
 {
 	int i;
-	int any = 0;
+	int rc = -1;
 
 	for (i = 0; i < nsyscalls; i++) {
 		if (strcmp(s, sysent[i].sys_name) == 0) {
 			qualify_one(i, opt, not);
-			any = 1;
+			rc = 0;
 		}
 	}
-	return !any;
+	return rc;
 }
 
 static int
@@ -309,12 +309,15 @@ qual_signal(s, opt, not)
 	int i;
 	char buf[32];
 
-	if (s && *s && isdigit((unsigned char)*s)) {
-		qualify_one(atoi(s), opt, not);
-		return 0;
+  	if (s && *s && isdigit((unsigned char)*s)) {
+ 		int signo = atoi(s);
+ 		if (signo < 0 || signo >= MAX_QUALS)
+ 			return -1;
+ 		qualify_one(signo, opt, not);
+ 		return 0;
 	}
 	if (strlen(s) >= sizeof buf)
-		return 0;
+		return -1;
 	strcpy(buf, s);
 	s = buf;
 	for (i = 0; s[i]; i++)
@@ -345,7 +348,10 @@ qual_desc(s, opt, not)
 	int not;
 {
 	if (s && *s && isdigit((unsigned char)*s)) {
-		qualify_one(atoi(s), opt, not);
+		int desc = atoi(s);
+		if (desc < 0 || desc >= MAX_QUALS)
+			return -1;
+		qualify_one(desc, opt, not);
 		return 0;
 	}
 	return -1;