system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-22 16:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly check malloc returns.

Browse source
This commit is contained in:
Søren Schmidt 2004-08-24 10:39:00 +00:00
parent 18aee723a3
commit 5a8f8e353e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=134242
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/dev/ata/atapi-cd.c
View file

@ -125,8 +125,7 @@ acd_attach(struct ata_device *atadev)
sizeof(struct changer)>>8, sizeof(struct changer),
0, 0, 0, 0, 0, 0 };
chp = malloc(sizeof(struct changer), M_ACD, M_NOWAIT | M_ZERO);
if (chp == NULL) {
if (!(chp = malloc(sizeof(struct changer), M_ACD, M_NOWAIT | M_ZERO))) {
ata_prtdev(atadev, "out of memory\n");
free(cdp, M_ACD);
return;
@ -674,7 +673,10 @@ acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, struct thread *td)
if (te->address_format == CD_MSF_FORMAT) {
struct cd_toc_entry *entry;
toc = malloc(sizeof(struct toc), M_ACD, M_NOWAIT | M_ZERO);
if (!(toc = malloc(sizeof(struct toc), M_ACD, M_NOWAIT))) {
error = ENOMEM;
break;
}
bcopy(&cdp->toc, toc, sizeof(struct toc));
entry = toc->tab + (toc->hdr.ending_track + 1 -
toc->hdr.starting_track) + 1;
@ -720,9 +722,11 @@ acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, struct thread *td)
if (te->address_format == CD_MSF_FORMAT) {
struct cd_toc_entry *entry;
toc = malloc(sizeof(struct toc), M_ACD, M_NOWAIT | M_ZERO);
if (!(toc = malloc(sizeof(struct toc), M_ACD, M_NOWAIT))) {
error = ENOMEM;
break;
}
bcopy(&cdp->toc, toc, sizeof(struct toc));
entry = toc->tab + (track - toc->hdr.starting_track);
lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute,
&entry->addr.msf.second, &entry->addr.msf.frame);
@ -1665,7 +1669,8 @@ acd_report_key(struct acd_softc *cdp, struct dvd_authinfo *ai)
ccb[10] = (ai->agid << 6) | ai->format;
if (length) {
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
if (!(d = malloc(length, M_ACD, M_NOWAIT | M_ZERO)))
return ENOMEM;
d->length = htons(length - 2);
}
@ -1729,19 +1734,22 @@ acd_send_key(struct acd_softc *cdp, struct dvd_authinfo *ai)
switch (ai->format) {
case DVD_SEND_CHALLENGE:
length = 16;
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
if (!(d = malloc(length, M_ACD, M_NOWAIT | M_ZERO)))
return ENOMEM;
bcopy(ai->keychal, &d->data[0], 10);
break;
case DVD_SEND_KEY2:
length = 12;
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
if (!(d = malloc(length, M_ACD, M_NOWAIT | M_ZERO)))
return ENOMEM;
bcopy(&ai->keychal[0], &d->data[0], 5);
break;
case DVD_SEND_RPC:
length = 8;
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
if (!(d = malloc(length, M_ACD, M_NOWAIT | M_ZERO)))
return ENOMEM;
d->data[0] = ai->region;
break;
@ -1803,7 +1811,8 @@ acd_read_structure(struct acd_softc *cdp, struct dvd_struct *s)
return EINVAL;
}
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
if (!(d = malloc(length, M_ACD, M_NOWAIT | M_ZERO)))
return ENOMEM;
d->length = htons(length - 2);
bzero(ccb, sizeof(ccb));