From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Tue, 16 Dec 2014 14:47:47 +0100 Subject: [U-Boot] [Patch V2 2/3] gadget: f_thor: check pointers before use in download_tail() In-Reply-To: <1418636051-31901-2-git-send-email-p.marczak@samsung.com> References: <1418295780-27611-1-git-send-email-p.marczak@samsung.com> <1418636051-31901-1-git-send-email-p.marczak@samsung.com> <1418636051-31901-2-git-send-email-p.marczak@samsung.com> Message-ID: <20141216144747.5ecb4596@amdc2363> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Przemyslaw, > Some pointers in function download_tail() were not checked > before the use. This could possibly cause the data abort. > To avoid this, check if the pointers are not null is added. > > Signed-off-by: Przemyslaw Marczak > --- > Change v2: > - download_tail(): change printf() to error() > --- > drivers/usb/gadget/f_thor.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c > index 78519fa..2d0410d 100644 > --- a/drivers/usb/gadget/f_thor.c > +++ b/drivers/usb/gadget/f_thor.c > @@ -205,12 +205,24 @@ static long long int download_head(unsigned > long long total, > static int download_tail(long long int left, int cnt) > { > - struct dfu_entity *dfu_entity = > dfu_get_entity(alt_setting_num); > - void *transfer_buffer = dfu_get_buf(dfu_entity); > + struct dfu_entity *dfu_entity; > + void *transfer_buffer; > int ret; > > debug("%s: left: %llu cnt: %d\n", __func__, left, cnt); > > + dfu_entity = dfu_get_entity(alt_setting_num); > + if (!dfu_entity) { > + error("Alt setting: %d entity not found!\n", > alt_setting_num); > + return -ENOENT; > + } > + > + transfer_buffer = dfu_get_buf(dfu_entity); > + if (!transfer_buffer) { > + error("Transfer buffer not allocated!"); > + return -ENXIO; > + } > + > if (left) { > ret = dfu_write(dfu_entity, transfer_buffer, left, > cnt++); if (ret) { Applied to u-boot-dfu, thanks! -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group