From 7c8369e2756ed4ca79e05d7018a4635299dad54a Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 19 Sep 2010 11:36:23 +0400 Subject: [PATCH] --- yaml --- r: 219912 b: refs/heads/master c: b1f5f54e91e30ecd5ac670edc8bb2c0ee5990d0f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/keucr/init.c | 2 ++ trunk/drivers/staging/keucr/msscsi.c | 4 ++++ trunk/drivers/staging/keucr/smscsi.c | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fa8f31776012..ca542d68558d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83ef41f0858b48cce4f8ca23f674ec55d50bf47d +refs/heads/master: b1f5f54e91e30ecd5ac670edc8bb2c0ee5990d0f diff --git a/trunk/drivers/staging/keucr/init.c b/trunk/drivers/staging/keucr/init.c index 2ae129bfb608..1934805844f2 100644 --- a/trunk/drivers/staging/keucr/init.c +++ b/trunk/drivers/staging/keucr/init.c @@ -300,6 +300,8 @@ int ENE_LoadBinCode(struct us_data *us, BYTE flag) return USB_STOR_TRANSPORT_GOOD; buf = kmalloc(0x800, GFP_KERNEL); + if (buf == NULL) + return USB_STOR_TRANSPORT_ERROR; switch ( flag ) { // For SD diff --git a/trunk/drivers/staging/keucr/msscsi.c b/trunk/drivers/staging/keucr/msscsi.c index b908a2383966..ad0c5c629935 100644 --- a/trunk/drivers/staging/keucr/msscsi.c +++ b/trunk/drivers/staging/keucr/msscsi.c @@ -168,6 +168,8 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) DWORD blkno; buf = kmalloc(blenByte, GFP_KERNEL); + if (buf == NULL) + return USB_STOR_TRANSPORT_ERROR; result = ENE_LoadBinCode(us, MS_RW_PATTERN); if (result != USB_STOR_XFER_GOOD) @@ -271,6 +273,8 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) WORD len, oldphy, newphy; 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 = ENE_LoadBinCode(us, MS_RW_PATTERN); diff --git a/trunk/drivers/staging/keucr/smscsi.c b/trunk/drivers/staging/keucr/smscsi.c index 43e32c6ded90..62116869b38a 100644 --- a/trunk/drivers/staging/keucr/smscsi.c +++ b/trunk/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);