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

Commit 1b301e83 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove broken dead code in cfs_cpt_table_create_pattern 



After a recent bugfix, we get a warning about the use of an uninitialized
variable:

drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c: In function 'cfs_cpt_table_create_pattern':
drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c:833:7: error: 'str' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This part of the function used to not do anything as we would reassign
the 'str' pointer to something else right away, but now we pass an
uninitialized pointer into 'strchr', which can cause a kernel page fault
or worse.

Fixes: 239fd5d4 ("staging: lustre: libcfs: shortcut to create CPT from NUMA topology")
Cc: Liang Zhen <liang.zhen@intel.com>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4bcd7e7

drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c

+0 −7
Original line number Diff line number Diff line
@@ -829,13 +829,6 @@ cfs_cpt_table_create_pattern(char *pattern) 
	int			c;

	int i;



	for (ncpt = 0;; ncpt++) { /* quick scan bracket */

		str = strchr(str, '[');

		if (!str)

			break;

		str++;

	}



	str = cfs_trimwhite(pattern);

	if (*str == 'n' || *str == 'N') {

		pattern = str + 1;