Return-Path: Subject: Re: [PATCH 3/3] SDP From: Santiago Carot Nemesio To: linux-bluetooth@vger.kernel.org In-Reply-To: <1272375425.2157.20.camel@mosquito> References: <1272375265.2157.17.camel@mosquito> <1272375425.2157.20.camel@mosquito> Content-Type: text/plain; charset="UTF-8" Date: Tue, 27 Apr 2010 15:39:38 +0200 Message-ID: <1272375578.2157.22.camel@mosquito> Mime-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: This patch add memory checks after malloc function is called. >>From 7cce3be5a1a1d506f4da71fc394ee3ccf71d8159 Mon Sep 17 00:00:00 2001 From: Santiago Carot Nemesio Date: Tue, 27 Apr 2010 15:19:44 +0200 Subject: [PATCH 3/3] Added memory checks Signed-off-by: Santiago Carot Nemesio --- lib/sdp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 7 deletions(-) diff --git a/lib/sdp.c b/lib/sdp.c index 667d412..64f2e96 100644 --- a/lib/sdp.c +++ b/lib/sdp.c @@ -1078,6 +1078,8 @@ static sdp_data_t *extract_int(const void *p, int bufsize, int *len) } d = malloc(sizeof(sdp_data_t)); + if (!d) + return NULL; SDPDBG("Extracting integer\n"); memset(d, 0, sizeof(sdp_data_t)); @@ -1152,6 +1154,9 @@ static sdp_data_t *extract_uuid(const uint8_t *p, int bufsize, int *len, { sdp_data_t *d = malloc(sizeof(sdp_data_t)); + if (!d) + return NULL; + SDPDBG("Extracting UUID"); memset(d, 0, sizeof(sdp_data_t)); if (sdp_uuid_extract(p, bufsize, &d->val.uuid, len) < 0) { @@ -1179,6 +1184,8 @@ static sdp_data_t *extract_str(const void *p, int bufsize, int *len) } d = malloc(sizeof(sdp_data_t)); + if (!d) + return NULL; memset(d, 0, sizeof(sdp_data_t)); d->dtd = *(uint8_t *) p; @@ -1302,6 +1309,9 @@ static sdp_data_t *extract_seq(const void *p, int bufsize, int *len, sdp_data_t *curr, *prev; sdp_data_t *d = malloc(sizeof(sdp_data_t)); + if (!d) + return NULL; + SDPDBG("Extracting SEQ"); memset(d, 0, sizeof(sdp_data_t)); *len = sdp_extract_seqtype(p, bufsize, &d->dtd, &seqlen); @@ -1945,10 +1955,17 @@ int sdp_get_uuidseq_attr(const sdp_record_t *rec, uint16_t attr, sdp_data_t *d; for (d = sdpdata->val.dataseq; d; d = d->next) { uuid_t *u; - if (d->dtd < SDP_UUID16 || d->dtd > SDP_UUID128) + if (d->dtd < SDP_UUID16 || d->dtd > SDP_UUID128) { + errno = EINVAL; goto fail; + } u = malloc(sizeof(uuid_t)); + if (!u) { + errno = ENOMEM; + goto fail; + } + memset(u, 0, sizeof(uuid_t)); *u = d->val.uuid; *seqp = sdp_list_append(*seqp, u); @@ -1957,7 +1974,7 @@ int sdp_get_uuidseq_attr(const sdp_record_t *rec, uint16_t attr, } fail: sdp_list_free(*seqp, free); - errno = EINVAL; + *seqp = NULL; return -1; } @@ -1974,7 +1991,15 @@ int sdp_set_uuidseq_attr(sdp_record_t *rec, uint16_t aid, sdp_list_t *seq) if (!seq || len == 0) return -1; dtds = (void **)malloc(len * sizeof(void *)); + if (!dtds) + return -1; + values = (void **)malloc(len * sizeof(void *)); + if (!values) { + free(dtds); + return -1; + } + for (p = seq, i = 0; i < len; i++, p = p->next) { uuid_t *uuid = (uuid_t *)p->data; if (uuid) @@ -2028,6 +2053,10 @@ int sdp_get_lang_attr(const sdp_record_t *rec, sdp_list_t **langSeq) sdp_data_t *pOffset = pEncoding->next; if (pEncoding && pOffset) { lang = malloc(sizeof(sdp_lang_attr_t)); + if (!lang) { + errno = ENOMEM; + goto fail; + } lang->code_ISO639 = pCode->val.uint16; lang->encoding = pEncoding->val.uint16; lang->base_offset = pOffset->val.uint16; @@ -2039,6 +2068,10 @@ int sdp_get_lang_attr(const sdp_record_t *rec, sdp_list_t **langSeq) curr_data = pOffset->next; } return 0; +fail: + sdp_list_free(*langSeq, free); + *langSeq = NULL; + return -1; } int sdp_get_profile_descs(const sdp_record_t *rec, sdp_list_t **profDescSeq) @@ -2069,6 +2102,8 @@ int sdp_get_profile_descs(const sdp_record_t *rec, sdp_list_t **profDescSeq) if (uuid != NULL) { profDesc = malloc(sizeof(sdp_profile_desc_t)); + if (!profDesc) + goto fail; profDesc->uuid = *uuid; profDesc->version = version; #ifdef SDP_DEBUG @@ -2079,6 +2114,10 @@ int sdp_get_profile_descs(const sdp_record_t *rec, sdp_list_t **profDescSeq) } } return 0; +fail: + sdp_list_free(*profDescSeq, free); + *profDescSeq = NULL; + return -1; } int sdp_get_server_ver(const sdp_record_t *rec, sdp_list_t **u16) @@ -2231,7 +2270,15 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto) seqlen = sdp_list_len(proto); seqDTDs = (void **)malloc(seqlen * sizeof(void *)); + if (!seqDTDs) + return NULL; + seqs = (void **)malloc(seqlen * sizeof(void *)); + if (!seqs) { + free(seqDTDs); + return NULL; + } + for (i = 0, p = proto; p; p = p->next, i++) { sdp_list_t *elt = (sdp_list_t *)p->data; sdp_data_t *s; @@ -2350,10 +2397,19 @@ int sdp_set_lang_attr(sdp_record_t *rec, const sdp_list_t *seq) { uint8_t uint16 = SDP_UINT16; int status = 0, i = 0, seqlen = sdp_list_len(seq); - void **dtds = (void **)malloc(3 * seqlen * sizeof(void *)); - void **values = (void **)malloc(3 * seqlen * sizeof(void *)); + void **dtds, **values; const sdp_list_t *p; + dtds = (void **)malloc(3 * seqlen * sizeof(void *)); + if (!dtds) + return -1; + + values = (void **)malloc(3 * seqlen * sizeof(void *)); + if (!values) { + free(dtds); + return -1; + } + for (p = seq; p; p = p->next) { sdp_lang_attr_t *lang = (sdp_lang_attr_t *)p->data; if (!lang) { @@ -2455,10 +2511,19 @@ int sdp_set_profile_descs(sdp_record_t *rec, const sdp_list_t *profiles) uint8_t uuid128 = SDP_UUID128; uint8_t uint16 = SDP_UINT16; int i = 0, seqlen = sdp_list_len(profiles); - void **seqDTDs = (void **)malloc(seqlen * sizeof(void *)); - void **seqs = (void **)malloc(seqlen * sizeof(void *)); + void **seqDTDs, **seqs; const sdp_list_t *p; + seqDTDs = (void **)malloc(seqlen * sizeof(void *)); + if (!seqDTDs) + return -1; + + seqs = (void **)malloc(seqlen * sizeof(void *)); + if (!seqs) { + free(seqDTDs); + return -1; + } + for (p = profiles; p; p = p->next) { sdp_data_t *seq; void *dtds[2], *values[2]; @@ -2642,7 +2707,11 @@ void sdp_uuid32_to_uuid128(uuid_t *uuid128, uuid_t *uuid32) uuid_t *sdp_uuid_to_uuid128(uuid_t *uuid) { - uuid_t *uuid128 = bt_malloc(sizeof(uuid_t)); + uuid_t *uuid128 = malloc(sizeof(uuid_t)); + + if (!uuid128) + return NULL; + memset(uuid128, 0, sizeof(uuid_t)); switch (uuid->type) { case SDP_UUID128: @@ -3087,6 +3156,10 @@ int sdp_record_update(sdp_session_t *session, const sdp_record_t *rec) sdp_record_t *sdp_record_alloc() { sdp_record_t *rec = malloc(sizeof(sdp_record_t)); + + if (!rec) + return NULL; + memset((void *)rec, 0, sizeof(sdp_record_t)); rec->handle = 0xffffffff; return rec; -- 1.6.3.3