projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bdcd78
)
[SCSI] drivers/scsi/sr_ioctl.c: check for failed allocation
author
Nate Dailey
<nhdailey@verizon.net>
Thu, 21 Apr 2005 20:14:05 +0000
(16:14 -0400)
committer
James Bottomley
<jejb@mulgrave.(none)>
Thu, 21 Apr 2005 20:14:05 +0000
(16:14 -0400)
I noticed a case in sr_ioctl.c's sr_get_mcn where a buffer is
allocated, but the pointer isn't checked for null.
Signed-off-by: Nate Dailey <nate.dailey@stratus.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/sr_ioctl.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/scsi/sr_ioctl.c
b/drivers/scsi/sr_ioctl.c
index 3471be05779a5220e40eb3e67d32ad3ee7b6bd8e..82d68fdb15484520abd80d1aa603d2395a86ad6b 100644
(file)
--- a/
drivers/scsi/sr_ioctl.c
+++ b/
drivers/scsi/sr_ioctl.c
@@
-281,6
+281,9
@@
int sr_get_mcn(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn)
char *buffer = kmalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));
int result;
+ if (!buffer)
+ return -ENOMEM;
+
memset(&cgc, 0, sizeof(struct packet_command));
cgc.cmd[0] = GPCMD_READ_SUBCHANNEL;
cgc.cmd[2] = 0x40; /* I do want the subchannel info */