scsi: scsi_devinfo: fixup string compare

commit b8018b973c7cefa5eb386540130fa47315b8e337 upstream.

When checking the model and vendor string we need to use the minimum
value of either string, otherwise we'll miss out on wildcard matches.

And we should take care when matching with zero size strings; results
might be unpredictable.  With this patch the rules for matching devinfo
strings are as follows:

- Vendor strings must match exactly
- Empty Model strings will only match if the devinfo model
  is also empty
- Model strings shorter than the devinfo model string will
  not match

Fixes: 5e7ff2c ("SCSI: fix new bug in scsi_dev_info_list string matching")
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 75f2179860a79cad9d0f011192d270d34d991f73..4055cb7c212b92b4e561c0ac8310903294a256f2 100644 (file)
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -386,8 +386,8 @@ EXPORT_SYMBOL(scsi_dev_info_list_add_keyed);
 
 /**
  * scsi_dev_info_list_find - find a matching dev_info list entry.
- * @vendor:    vendor string
- * @model:     model (product) string
+ * @vendor:    full vendor string
+ * @model:     full model (product) string
  * @key:       specify list to use
  *
  * Description:
@@ -402,7 +402,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
        struct scsi_dev_info_list *devinfo;
        struct scsi_dev_info_list_table *devinfo_table =
                scsi_devinfo_lookup_by_key(key);
-       size_t vmax, mmax;
+       size_t vmax, mmax, mlen;
        const char *vskip, *mskip;
 
        if (IS_ERR(devinfo_table))
@@ -441,15 +441,18 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
                            dev_info_list) {
                if (devinfo->compatible) {
                        /*
-                        * Behave like the older version of get_device_flags.
+                        * vendor strings must be an exact match
                         */
-                       if (memcmp(devinfo->vendor, vskip, vmax) ||
-                                       (vmax < sizeof(devinfo->vendor) &&
-                                               devinfo->vendor[vmax]))
+                       if (vmax != strlen(devinfo->vendor) ||
+                           memcmp(devinfo->vendor, vskip, vmax))
                                continue;
-                       if (memcmp(devinfo->model, mskip, mmax) ||
-                                       (mmax < sizeof(devinfo->model) &&
-                                               devinfo->model[mmax]))
+
+                       /*
+                        * @model specifies the full string, and
+                        * must be larger or equal to devinfo->model
+                        */
+                       mlen = strlen(devinfo->model);
+                       if (mmax < mlen || memcmp(devinfo->model, mskip, mlen))
                                continue;
                        return devinfo;
                } else {