The patch titled
pcmcia: include bad CIS filename in error message
has been added to the -mm tree. Its filename is
pcmcia-include-bad-cis-filename-in-error-message.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pcmcia: include bad CIS filename in error message
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
- Print the invalid CIS filename in the invalid filename message.
- Use sizeof() instead of hard-coded constant for buffer size.
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pcmcia/ds.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/pcmcia/ds.c~pcmcia-include-bad-cis-filename-in-error-message drivers/pcmcia/ds.c
--- a/drivers/pcmcia/ds.c~pcmcia-include-bad-cis-filename-in-error-message
+++ a/drivers/pcmcia/ds.c
@@ -865,11 +865,12 @@ static int pcmcia_load_firmware(struct p
ds_dbg(1, "trying to load CIS file %s\n", filename);
if (strlen(filename) > 14) {
- printk(KERN_WARNING "pcmcia: CIS filename is too long\n");
+ printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
+ filename);
return -EINVAL;
}
- snprintf(path, 20, "%s", filename);
+ snprintf(path, sizeof(path), "%s", filename);
if (request_firmware(&fw, path, &dev->dev) == 0) {
if (fw->size >= CISTPL_MAX_CIS_SIZE) {
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
pcmcia-fix-kernel-doc-comments.patch
git-dvb.patch
git-kbuild.patch
pcmcia-include-bad-cis-filename-in-error-message.patch
git-scsi-misc.patch
advansys-fix-section-mismatch-warning.patch
aic94-fix-section-mismatches.patch
sym2-fix-section-mismatch-warning.patch
git-unionfs.patch
git-ipwireless_cs.patch
git-x86.patch
register_cpu-__devinit-or-__cpuinit.patch
cciss-use-upper_32_bits-macro-to-eliminate-warnings.patch
move-kprobes-examples-to-samples-resend.patch
move-kprobes-examples-to-samples-resend-checkpatch-fixes.patch
move-kprobes-examples-to-samples-resend-vs-git-x86.patch
fs-menu-small-reorg.patch
profile-likely-unlikely-macros.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
