[PATCH] numademo: msize check for ptrchase test

[PATCH] numademo: msize check for ptrchase test

[Petr Holasek]

From: Petr Holasek <pholasek@redhat.com>

This patch fixes ptrchase test segfault, when numademo is 
called with argument lower than sizeof(struct union node) 
(8 bytes on x86_64).

--
diff -up numactl-2.0.8-rc3/numademo.c.orig numactl-2.0.8-rc3/numademo.c
--- numactl-2.0.8-rc3/numademo.c.orig	2011-12-19 15:51:35.000000000 +0100
+++ numactl-2.0.8-rc3/numademo.c	2012-02-16 14:44:34.510249987 +0100
@@ -529,7 +529,13 @@ int main(int ac, char **av)
 #ifdef HAVE_STREAM_LIB
 		test(STREAM);
 #endif
-		test(PTRCHASE);
+		if (msize >= sizeof(union node)) {
+			test(PTRCHASE);
+		} else {
+			fprintf(stderr, "You must set msize at least %lu bytes for ptrchase test.\n",
+				sizeof(union node));
+			exit(1);
+		}
 	} else {
 		int k;
 		for (k = 2; k < ac; k++) {

Re: [PATCH] numademo: msize check for ptrchase test

[Cliff Wickman]

Thanks Petr.  I've included your patch in numactl-2.0.8-rc4.tar.gz
( ftp://oss.sgi.com/www/projects/libnuma/download/ )


To all interested in libnuma and numactl:

These are the changes since the 2.0.7, released in April, 2011:

2.0.8-rc1
- 110818 Checking of sucessful allocations in numademo (Petr Holasek)
2.0.8-rc2
- 110823 Fix of numactl (--touch) warnings and man page (Cliff W.) 2.0.8-rc3
- 111214 Add "same" nodemask alias to numactl (Andi Kleen)
- 111214 Add constructors for numa_init/exit (Andi Kleen)
- 111214 Add use of glibc syscall stub where possible (Andi Kleen)
- 111214 Fix regress1 to show all the problems before exiting (Andi Kleen)
- 111214 Add IO affinity support (Andi Kleen)
- 111214 Clean regression test temp files (Andi Kleen)
- 111214 Add an option to memhog to disable transparent huge pages (Andi Kleen)
- 111214 Fix the test suite on systems that force THP, disable them (Andi Kleen)
2.0.8-rc4
- 120106 Install man pages migspeed, migratepages and numastat (Petr Holasek)
- 120106 Warnings in numa_node_to_cpus_v1 to be more verbose (Petr Holasek)
- 120216 Fix for numademo: msize check for ptrchase test (Petr Holasek)

Version 2.0.8 should probably be released soon.  If you have any plans in hand
or in mind for fixes or enhancements, please send them or let me know that
they are coming.

Any testing of the current (2.0.8-rc4) would also be appreciated.

-Cliff


On Thu, Feb 16, 2012 at 08:54:25AM -0500, Petr Holasek wrote:
> From: Petr Holasek <pholasek@redhat.com>
> 
> This patch fixes ptrchase test segfault, when numademo is 
> called with argument lower than sizeof(struct union node) 
> (8 bytes on x86_64).
> 
> --
> diff -up numactl-2.0.8-rc3/numademo.c.orig numactl-2.0.8-rc3/numademo.c
> --- numactl-2.0.8-rc3/numademo.c.orig	2011-12-19 15:51:35.000000000 +0100
> +++ numactl-2.0.8-rc3/numademo.c	2012-02-16 14:44:34.510249987 +0100
> @@ -529,7 +529,13 @@ int main(int ac, char **av)
>  #ifdef HAVE_STREAM_LIB
>  		test(STREAM);
>  #endif
> -		test(PTRCHASE);
> +		if (msize >= sizeof(union node)) {
> +			test(PTRCHASE);
> +		} else {
> +			fprintf(stderr, "You must set msize at least %lu bytes for ptrchase test.\n",
> +				sizeof(union node));
> +			exit(1);
> +		}
>  	} else {
>  		int k;
>  		for (k = 2; k < ac; k++) {

-- 
Cliff Wickman
SGI
cpw@sgi.com
(651) 683-3824