summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorAndrew Paprocki <andrew@ishiboo.com>2007-10-15 15:43:12 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-15 15:44:22 -0400
commit317b50b8ad2f544a12c8f29d99a91225e8c5db1d (patch)
tree43af04f1f7eedd4dca63ad401c4ca65bc4247d5c /drivers/ata
parent8f73a6880183dd11b97d70e738cf82d15931d98b (diff)
downloadlinux-3.10-317b50b8ad2f544a12c8f29d99a91225e8c5db1d.tar.gz
linux-3.10-317b50b8ad2f544a12c8f29d99a91225e8c5db1d.tar.bz2
linux-3.10-317b50b8ad2f544a12c8f29d99a91225e8c5db1d.zip
libata: prevent devices with blank model names from being DMA blacklisted
The strn_pattern_cmp routine does not handle a blank name parameter properly. The only patterns which should match a blank name are "*" and an explicit "". If the function is passed a blank name in current code, it will always match against the patt parameter. The bug manifests itself as the device with the empty model name always matching the first device in the DMA blacklist, forcing it to revert to PIO mode. Signed-off-by: Andrew Paprocki <andrew@ishiboo.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index d69699973b5..68699b3e799 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4014,8 +4014,14 @@ int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
p = strchr(patt, wildchar);
if (p && ((*(p + 1)) == 0))
len = p - patt;
- else
+ else {
len = strlen(name);
+ if (!len) {
+ if (!*patt)
+ return 0;
+ return -1;
+ }
+ }
return strncmp(patt, name, len);
}