From patchwork Tue Apr 27 21:11:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 3252 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 27 Apr 2010 21:21:13 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Tue, 27 Apr 2010 18:23:14 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O6sDR-0007Ho-EP; Tue, 27 Apr 2010 21:21:13 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756869Ab0D0VVM (ORCPT + 1 other); Tue, 27 Apr 2010 17:21:12 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:46631 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755187Ab0D0VVL (ORCPT ); Tue, 27 Apr 2010 17:21:11 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLHc0G021542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Apr 2010 14:20:39 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLBK9R019985; Tue, 27 Apr 2010 14:11:20 -0700 Message-Id: <201004272111.o3RLBK9R019985@imap1.linux-foundation.org> Subject: [patch 03/11] dvb-usb: gp8psk, fix potential null derefernce To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, jslaby@suse.cz, alannisota@gmail.com, pb@linuxtv.org From: akpm@linux-foundation.org Date: Tue, 27 Apr 2010 14:11:20 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.504 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Jiri Slaby Stanse found that in gp8psk_load_bcm4500fw there is missing a check for return value of kmalloc. Add one and bail out appropriatelly. Signed-off-by: Jiri Slaby Cc: Alan Nisota Cc: Patrick Boettcher Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/dvb/dvb-usb/gp8psk.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN drivers/media/dvb/dvb-usb/gp8psk.c~dvb-usb-gp8psk-fix-potential-null-derefernce drivers/media/dvb/dvb-usb/gp8psk.c --- a/drivers/media/dvb/dvb-usb/gp8psk.c~dvb-usb-gp8psk-fix-potential-null-derefernce +++ a/drivers/media/dvb/dvb-usb/gp8psk.c @@ -105,6 +105,10 @@ static int gp8psk_load_bcm4500fw(struct ptr = fw->data; buf = kmalloc(64, GFP_KERNEL | GFP_DMA); + if (!buf) { + ret = -ENOMEM; + goto out_rel_fw; + } while (ptr[0] != 0xff) { u16 buflen = ptr[0] + 4;