The patch titled zfcp: test kmalloc failure in scsi_get_vpd_page() has been added to the -mm tree. Its filename is zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: zfcp: test kmalloc failure in scsi_get_vpd_page() From: Roel Kluin <roel.kluin@xxxxxxxxx> kmalloc() may fail, so test whether it succeeded. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc: Wei Yongjun <yjwei@xxxxxxxxxxxxxx> Cc: Mike Christie <michaelc@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/scsi.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/scsi/scsi.c~zfcp-test-kmalloc-failure-in-scsi_get_vpd_page drivers/scsi/scsi.c --- a/drivers/scsi/scsi.c~zfcp-test-kmalloc-failure-in-scsi_get_vpd_page +++ a/drivers/scsi/scsi.c @@ -1057,6 +1057,8 @@ unsigned char *scsi_get_vpd_page(struct kfree(buf); buf = kmalloc(len, GFP_KERNEL); + if (!buf) + return NULL; result = scsi_vpd_inquiry(sdev, buf, page, len); if (result) goto fail; _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are linux-next.patch s3c-fix-check-of-index-into-s3c_gpios.patch stmp3xxx-deallocation-with-negative-index-of-descriptors.patch dm-strncpy-does-not-null-terminate-string.patch pcmcia-fix-read-buffer-overflow.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch drm-i915-intel_sdvo_multifunc_encoder-sdvo_output_svid0-tested-twice.patch mips-decrease-size-of-au1xxx_dbdma_pm_regs.patch slram-read-buffer-overflow.patch mtd-fix-read-buffer-overflow.patch mtd-jffs2-fix-read-buffer-overflow.patch mtd-prevent-a-read-from-eraseregions.patch mtd-prevent-a-read-from-regions.patch hfc_usb-fix-read-buffer-overflow.patch zorro8390-fix-read-buffer-overflow-in-zorro8390_init_one-checkpatch-fixes.patch cyclades-read-buffer-overflow.patch serial167-fix-read-buffer-overflow.patch cio-double-put_device-in-subchannel_register.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch nl80211-jump-to-out_err-upon-unsupported-iftype.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch blackfin-fix-read-buffer-overflow.patch arch-alpha-boot-tools-objstripc-wrong-variable-tested-after-open.patch m32r-remove-redundant-tests-on-unsigned.patch uml-fix-order-of-pud-and-pmd_free.patch dme1737-keep-index-within-pwm_config.patch sdio-fix-read-buffer-overflow.patch hwmon-fix-freeing-of-gpio_data-and-irq.patch ncpfs-read-buffer-overflow.patch smbfs-read-buffer-overflow.patch platinumfb-misplaced-parenthesis.patch sisfb-read-buffer-overflow.patch drivers-video-console-newport_conc-fix-read-outside-array-bounds.patch kref-documentation-double-kref_put-in-my_data_handler.patch mwave-fix-read-buffer-overflow.patch adfs-remove-redundant-test-on-unsigned.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