summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@suse.cz>2014-02-07 19:15:11 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-07 11:26:35 -0800
commit03b56329f9bb5a1cb73d7dc659d529a9a9bf3acc (patch)
treefc0968a9e7cd6003903060e2764c7bad56d887e0 /scripts
parent7f196caffbf2dc96cc145bf5d2ef5ef8a7b4f687 (diff)
downloadlinux-stable-03b56329f9bb5a1cb73d7dc659d529a9a9bf3acc.tar.gz
linux-stable-03b56329f9bb5a1cb73d7dc659d529a9a9bf3acc.tar.bz2
linux-stable-03b56329f9bb5a1cb73d7dc659d529a9a9bf3acc.zip
Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
Commit afe2dab4f6 ("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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 23708636b05c..25e5cb0aaef6 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -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))