Skip to content

L
linux
Switch branch/tag
  1. 09 Nov, 2015 6 commits
  3. 03 Nov, 2015 13 commits
  5. 29 Oct, 2015 19 commits
  7. 27 Oct, 2015 2 commits
    • Alan Stern's avatar
      SCSI: fix bug in scsi_dev_info_list matching · b704f70c
      Alan Stern authored 
      The "compatible" matching algorithm used for looking up old-style
blacklist entries in a scsi_dev_info_list is buggy.  The core of the
algorithm looks like this:

		if (memcmp(devinfo->vendor, vendor,
			    min(max, strlen(devinfo->vendor))))
			/* not a match */

where max is the length of the device's vendor string after leading
spaces have been removed but trailing spaces have not.  Because of the
min() computation, either entry could be a proper substring of the
other and the code would still think that they match.

In the case originally reported, the device's vendor and product
strings were "Inateck " and "                ".  These matched against
the following entry in the global device list:

	{"", "Scanner", "1.80", BLIST_NOLUN}

because "" is a substring of "Inateck " and "" (the result of removing
leading spaces from the device's product string) is a substring of
"Scanner".  The mistaken match prevented the system from scanning and
finding the device's second Logical Unit.

This patch fixes the problem by making two changes.  First, the code
for leading-space removal is hoisted out of the loop.  (This means it
will sometimes run unnecessarily, but since a large percentage of all
lookups involve the "compatible" entries in global device list, this
should be an overall improvement.)  Second and more importantly, the
patch removes trailing spaces and adds a check to verify that the two
resulting strings are exactly the same length.  This prevents matches
where one entry is a proper substring of the other.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarGiulio Bernardi <ugilio@gmail.com>
Tested-by: default avatarGiulio Bernardi <ugilio@gmail.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
      b704f70c
    • Alan Stern's avatar
      SCSI: refactor device-matching code in scsi_devinfo.c · c42b3654
      Alan Stern authored 
      In drivers/scsi/scsi_devinfo.c, the scsi_dev_info_list_del_keyed() and
scsi_get_device_flags_keyed() routines contain a large amount of
duplicate code for finding vendor/product matches in a
scsi_dev_info_list.  This patch factors out the duplicate code and
puts it in a separate function, scsi_dev_info_list_find().
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Suggested-by: default avatarGiulio Bernardi <ugilio@gmail.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
      c42b3654
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7