From patchwork Fri Oct 1 21:13:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 4478 Return-path: Envelope-to: mchehab@pedra Delivery-date: Fri, 01 Oct 2010 21:45:26 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1P1qEA-0007Lc-3s for mchehab@pedra; Fri, 01 Oct 2010 21:45:26 -0300 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 01 Oct 2010 21:45:26 -0300 (BRT) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1P1qDG-0006EC-Rf for mchehab@bombadil.infradead.org; Sat, 02 Oct 2010 00:44:30 +0000 Received: from vger.kernel.org ([209.132.180.67]) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P1p0y-0003XW-PZ; Fri, 01 Oct 2010 23:27:45 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094Ab0JAVOb (ORCPT + 1 other); Fri, 1 Oct 2010 17:14:31 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:49107 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752126Ab0JAVOa (ORCPT ); Fri, 1 Oct 2010 17:14:30 -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 o91LDfwt022056 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 1 Oct 2010 14:13:41 -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 o91LDeMi020977; Fri, 1 Oct 2010 14:13:40 -0700 Message-Id: <201010012113.o91LDeMi020977@imap1.linux-foundation.org> Subject: [patch 1/2] drivers/media/IR/ene_ir.c: fix NULL dereference To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, jslaby@suse.cz, maximlevitsky@gmail.com, mchehab@redhat.com From: akpm@linux-foundation.org Date: Fri, 01 Oct 2010 14:13:40 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.494 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 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: From: Jiri Slaby When 'dev' allocation fails in ene_probe we jump to error label where we dereference the 'dev'. Fix it by jumping few lines below. Signed-off-by: Jiri Slaby Cc: Maxim Levitsky Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/IR/ene_ir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/media/IR/ene_ir.c~drivers-media-ir-ene_irc-fix-null-dereference drivers/media/IR/ene_ir.c --- a/drivers/media/IR/ene_ir.c~drivers-media-ir-ene_irc-fix-null-dereference +++ a/drivers/media/IR/ene_ir.c @@ -785,7 +785,7 @@ static int ene_probe(struct pnp_dev *pnp dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL); if (!input_dev || !ir_props || !dev) - goto error; + goto error1; /* validate resources */ error = -ENODEV; @@ -899,7 +899,7 @@ error: free_irq(dev->irq, dev); if (dev->hw_io) release_region(dev->hw_io, ENE_MAX_IO); - +error1: input_free_device(input_dev); kfree(ir_props); kfree(dev);