2007-08-20 Dmitry V. Levin <ldv@altlinux.org>

	* syscall.c (qual_syscall, qualify): Fix nsyscalls and MAX_QUALS misuse.
	Reported by Xiaoning Ding.

diff --git a/ChangeLog b/ChangeLog
index fe097747b3fc1b7584f5b609a69b281b3a01a582..d6ceff9b1a6ea816bf8ef03993fc677b485a2ddb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-20  Dmitry V. Levin <ldv@altlinux.org>
+
+       * syscall.c (qual_syscall, qualify): Fix nsyscalls and MAX_QUALS misuse.
+       Reported by Xiaoning Ding.
+
 2007-08-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
            Roland McGrath  <roland@redhat.com>
 

diff --git a/syscall.c b/syscall.c
index dabdd76f16a25cada8eb63311bf114e9857abbf7..1ee6ce19e11c1809072a66cc4e21f9927d8e8997 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -324,18 +324,19 @@ qual_syscall(s, opt, not)
 
        if (isdigit((unsigned char)*s)) {
                int i = atoi(s);
-               if (i < 0 || i >= nsyscalls)
+               if (i < 0 || i >= MAX_QUALS)
                        return -1;
                qualify_one(i, opt, not, -1);
                return 0;
        }
-       for (i = 0; i < nsyscalls; i++) {
+       for (i = 0; i < nsyscalls0; i++)
                if (strcmp(s, sysent0[i].sys_name) == 0) {
                        qualify_one(i, opt, not, 0);
                        rc = 0;
                }
 
 #if SUPPORTED_PERSONALITIES >= 2
+       for (i = 0; i < nsyscalls1; i++)
                if (strcmp(s, sysent1[i].sys_name) == 0) {
                        qualify_one(i, opt, not, 1);
                        rc = 0;
@@ -343,12 +344,13 @@ qual_syscall(s, opt, not)
 #endif /* SUPPORTED_PERSONALITIES >= 2 */
 
 #if SUPPORTED_PERSONALITIES >= 3
+       for (i = 0; i < nsyscalls2; i++)
                if (strcmp(s, sysent2[i].sys_name) == 0) {
                        qualify_one(i, opt, not, 2);
                        rc = 0;
                }
 #endif /* SUPPORTED_PERSONALITIES >= 3 */
-       }
+
        return rc;
 }
 
@@ -466,20 +468,22 @@ char *s;
        }
        for (p = strtok(s, ","); p; p = strtok(NULL, ",")) {
                if (opt->bitflag == QUAL_TRACE && (n = lookup_class(p)) > 0) {
-                       for (i = 0; i < MAX_QUALS; i++) {
+                       for (i = 0; i < nsyscalls0; i++)
                                if (sysent0[i].sys_flags & n)
                                        qualify_one(i, opt, not, 0);
 
 #if SUPPORTED_PERSONALITIES >= 2
+                       for (i = 0; i < nsyscalls1; i++)
                                if (sysent1[i].sys_flags & n)
                                        qualify_one(i, opt, not, 1);
 #endif /* SUPPORTED_PERSONALITIES >= 2 */
 
 #if SUPPORTED_PERSONALITIES >= 3
+                       for (i = 0; i < nsyscalls2; i++)
                                if (sysent2[i].sys_flags & n)
                                        qualify_one(i, opt, not, 2);
 #endif /* SUPPORTED_PERSONALITIES >= 3 */
-                       }
+
                        continue;
                }
                if (opt->qualify(p, opt, not)) {