Commit 03b56329 authored Feb 07, 2014 by Jan Moskyto Matejka Committed by Greg Kroah-Hartman Feb 07, 2014

Modpost: fixed USB alias generation for ranges including 0x9 and 0xA



Commit afe2dab4 ("USB: add hex/bcd detection to usb modalias generation")
changed the routine that generates alias ranges. Before that change, only
digits 0-9 were supported; the commit tried to fix the case when the range
includes higher values than 0x9.

Unfortunately, the commit didn't fix the case when the range includes both
0x9 and 0xA, meaning that the final range must look like [x-9A-y] where
x <= 0x9 and y >= 0xA -- instead the [x-9A-x] range was produced.

Modprobe doesn't complain as it sees no difference between no-match and
bad-pattern results of fnmatch().

Fixing this simple bug to fix the aliases.
Also changing the hardcoded beginning of the range to uppercase as all the
other letters are also uppercase in the device version numbers.

Fortunately, this affects only the dvb-usb-dib0700 module, AFAIK.

Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7f196caf

scripts/mod/file2alias.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -210,8 +210,8 @@ static void do_usb_entry(void *symval,
		range_lo < 0x9 ? "[%X-9" : "[%X",
		range_lo);
		sprintf(alias + strlen(alias),
		range_hi > 0xA ? "a-%X]" : "%X]",
		range_lo);
		range_hi > 0xA ? "A-%X]" : "%X]",
		range_hi);
		}
		}
		if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1))

Admin message