From patchwork Sat May 16 22:49:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 27305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-px0-f145.google.com (mail-px0-f145.google.com [209.85.216.145]) by bilbo.ozlabs.org (Postfix) with ESMTP id C10A9B7069 for ; Sun, 17 May 2009 08:49:26 +1000 (EST) Received: by pxi9 with SMTP id 9so1320254pxi.29 for ; Sat, 16 May 2009 15:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:received:x-sender:x-apparently-to :received:received:received-spf:authentication-results:received :received:date:from:to:cc:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:x-spam-status :x-spam-checker-version:x-mimedefang-filter:x-scanned-by:reply-to :sender:precedence:x-google-loop:mailing-list:list-id:list-post :list-help:list-unsubscribe:x-beenthere-env:x-beenthere; bh=E0tdEtgF5G6IOR1nYEZVFDGXyfGAGsHEkSHMzVBBUaU=; b=qmjEhthQ8pJ/jA7jgdtPNnQQJ/XR/t4a/bxAYRZi4UAbF+hCUM8HPsZebTO3dZRwba EKvnCx+3ZdMV8WelQ48vnMOYer2GVhHKgTMQ5RkbJXY8Lgdi/E3PNdhdxWE5zVqKknM6 elkXXw6rhoM0+EQFv3dh9XTzplPOfvDYzMmUk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-sender:x-apparently-to:received-spf:authentication-results:date :from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:x-spam-status:x-spam-checker-version :x-mimedefang-filter:x-scanned-by:reply-to:sender:precedence :x-google-loop:mailing-list:list-id:list-post:list-help :list-unsubscribe:x-beenthere-env:x-beenthere; b=x6liLjcmKv/DlZ36ZljTa24V6G7xzVs2VTgGNAJ55iqpPJ2kyPdrXCIPjHceEB38sI fJ4FaAwv41ugPcGUQ5FpFTkUIKc3PkvpCcEqkfD1hVSudBW73AQUUTXvQGhHMSzXQiI7 pO1oLaDKKSx86FdWDRkf+krC3tfonT1ZDrPOY= Received: by 10.141.29.16 with SMTP id g16mr888432rvj.4.1242514161550; Sat, 16 May 2009 15:49:21 -0700 (PDT) Received: by 10.107.5.24 with SMTP id h24gr2370pri.0; Sat, 16 May 2009 15:49:21 -0700 (PDT) X-Sender: akpm@linux-foundation.org X-Apparently-To: rtc-linux@googlegroups.com Received: by 10.114.185.8 with SMTP id i8mr1269900waf.26.1242514161093; Sat, 16 May 2009 15:49:21 -0700 (PDT) Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by gmr-mx.google.com with ESMTP id m37si770151waf.4.2009.05.16.15.49.21; Sat, 16 May 2009 15:49:21 -0700 (PDT) Received-SPF: pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.13 as permitted sender) client-ip=140.211.169.13; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of akpm@linux-foundation.org designates 140.211.169.13 as permitted sender) smtp.mail=akpm@linux-foundation.org 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 n4GMnEcd030179 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 May 2009 15:49:15 -0700 Received: from y.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with SMTP id n4GMnCLq010113; Sat, 16 May 2009 15:49:13 -0700 Date: Sat, 16 May 2009 15:49:12 -0700 From: Andrew Morton To: Alessandro Zummo Cc: rtc-linux@googlegroups.com, mingo@elte.hu, Ozan =?UTF-8?Q?=C3=87a?= =?UTF-8?Q?=C4=9Flayan?= , David Brownell , "linux-kernel@vger.kernel.org" , Kay Sievers , Greg KH , Tejun Heo Subject: [rtc-linux] Re: [BUG 2.6.30_rc5] Null pointer dereference in rtc-cmos driver Message-Id: <20090516154912.a0efc677.akpm@linux-foundation.org> In-Reply-To: <20090515210134.758f3123@i1501.lan.towertech.it> References: <4A0C43C3.9090404@pardus.org.tr> <20090515174056.GD29647@elte.hu> <20090515210134.758f3123@i1501.lan.towertech.it> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Spam-Status: No, hits=-1.491 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, OSDL_TARGET 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 Reply-To: rtc-linux@googlegroups.com Sender: rtc-linux@googlegroups.com Precedence: bulk X-Google-Loop: groups Mailing-List: list rtc-linux@googlegroups.com; contact rtc-linux+owner@googlegroups.com List-Id: List-Post: List-Help: List-Unsubscribe: , X-BeenThere-Env: rtc-linux@googlegroups.com X-BeenThere: rtc-linux@googlegroups.com On Fri, 15 May 2009 21:01:34 +0200 Alessandro Zummo wrote: > On Fri, 15 May 2009 19:40:56 +0200 > Ingo Molnar wrote: > > more Cc:s > c'mon guys, it isn't that hard. > > ... > > > > [ 10.428691] Error: Driver 'rtc_cmos' is already registered, aborting... This should fix the symptoms: From: Andrew Morton Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13326 Prevents a null-pointer deref under the above-described circumstances. pnp_unregister_driver() shouldn't oops the kernel either - that's a Tested-by: Ozan Caglayan different bug. Reported-by: Cc: Alessandro Zummo Cc: Ingo Molnar Cc: David Brownell Cc: Bjorn Helgaas Signed-off-by: Andrew Morton --- drivers/rtc/rtc-cmos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/rtc/rtc-cmos.c~drivers-rtc-rtc-cmosc-cmos_init-dont-ignore-pnp_register_driver-return-value drivers/rtc/rtc-cmos.c --- a/drivers/rtc/rtc-cmos.c~drivers-rtc-rtc-cmosc-cmos_init-dont-ignore-pnp_register_driver-return-value +++ a/drivers/rtc/rtc-cmos.c @@ -1179,7 +1179,9 @@ static int __init cmos_init(void) int retval = 0; #ifdef CONFIG_PNP - pnp_register_driver(&cmos_pnp_driver); + retval = pnp_register_driver(&cmos_pnp_driver); + if (retval < 0) + return retval; #endif if (!cmos_rtc.dev)