Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

[~andy/linux] / drivers / staging / keucr / smscsi.c

diff --git a/drivers/staging/keucr/smscsi.c b/drivers/staging/keucr/smscsi.c
index 43e32c6ded90792724da2e2ae9e2c9a07d4f2dcb..62116869b38aaa67994fbfbbb43f6eb220fa885c 100644 (file)
--- a/drivers/staging/keucr/smscsi.c
+++ b/drivers/staging/keucr/smscsi.c
@@ -145,6 +145,8 @@ int SM_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb)
                return USB_STOR_TRANSPORT_ERROR;
 
        buf = kmalloc(blenByte, GFP_KERNEL);
+       if (buf == NULL)
+               return USB_STOR_TRANSPORT_ERROR;
        result = Media_D_ReadSector(us, bn, blen, buf);
        usb_stor_set_xfer_buf(us, buf, blenByte, srb, TO_XFER_BUF);
        kfree(buf);
@@ -175,6 +177,8 @@ int SM_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb)
                return USB_STOR_TRANSPORT_ERROR;
 
        buf = kmalloc(blenByte, GFP_KERNEL);
+       if (buf == NULL)
+               return USB_STOR_TRANSPORT_ERROR;
        usb_stor_set_xfer_buf(us, buf, blenByte, srb, FROM_XFER_BUF);
        result = Media_D_CopySector(us, bn, blen, buf);
        kfree(buf);