summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Taprogge <jens.taprogge@taprogge.org>2012-09-07 10:29:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-07 08:27:34 -0700
commit5948ae27fb4f0e87ce8543ca1934599b83929a3e (patch)
treed7d8e33ddc830a1b969f87d9064550024b1dd957
parent7953e44cefe1359032d1148de69b966bcd2e5233 (diff)
staging/ipack: Fix bug introduced by IPack device matching
~0 can not be casted to u8. Instead of using the IPACK_ANY_ID for the format field we introduce a new IPACK_ANY_FORMAT specifically for that field and defined as 0xff. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org> Acked-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/ipack/ipack.c3
-rw-r--r--include/linux/mod_devicetable.h1
-rw-r--r--scripts/mod/file2alias.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/ipack/ipack.c b/drivers/staging/ipack/ipack.c
index b3736c0a1086..659aadcac04d 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/staging/ipack/ipack.c
@@ -31,7 +31,8 @@ static inline const struct ipack_device_id *
ipack_match_one_device(const struct ipack_device_id *id,
const struct ipack_device *device)
{
- if ((id->format == IPACK_ANY_ID || id->format == device->id_format) &&
+ if ((id->format == IPACK_ANY_FORMAT ||
+ id->format == device->id_format) &&
(id->vendor == IPACK_ANY_ID || id->vendor == device->id_vendor) &&
(id->device == IPACK_ANY_ID || id->device == device->id_device))
return id;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 999c4c25fbf7..70c6a359b2f4 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -600,6 +600,7 @@ struct x86_cpu_id {
#define X86_MODEL_ANY 0
#define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
+#define IPACK_ANY_FORMAT 0xff
#define IPACK_ANY_ID (~0)
struct ipack_device_id {
__u8 format; /* Format version or IPACK_ANY_ID */
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 3c22bda8fdf3..df4fc23dd836 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -973,7 +973,7 @@ static int do_ipack_entry(const char *filename,
id->vendor = TO_NATIVE(id->vendor);
id->device = TO_NATIVE(id->device);
strcpy(alias, "ipack:");
- ADD(alias, "f", id->format != IPACK_ANY_ID, id->format);
+ ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format);
ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor);
ADD(alias, "d", id->device != IPACK_ANY_ID, id->device);
add_wildcard(alias);