From patchwork Tue Apr 24 20:43:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 8096 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2249323E1D for ; Tue, 24 Apr 2012 20:44:50 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 98A15A18175 for ; Tue, 24 Apr 2012 20:44:49 +0000 (UTC) Received: by iage36 with SMTP id e36so2076469iag.11 for ; Tue, 24 Apr 2012 13:44:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-content-scanned:x-cbid :x-gm-message-state; bh=U4tZmgxWGycoyywntmy1vtpG+QH1fqgaGKX1dj0ZVuw=; b=ghD48NWaWOlzvvXfy+ue6xLYcnMzPHJ/gScI8fdTZ+NacZtoiEif7efj9oAubEPtus k1SbN8F+x/b1y2vSPJ3PIRU5yy2CYZZuuGbfqM47Rhmi0s9w/Rx9RSkSYlKE4uF2hM0+ 7iaZveBpT4oa5pQ2X/UOP1flGo+oRzVEcx68v865NNID4qHlFbr8l0caJ0hPPsbu5YGl nTglXTTl5P4x1ionbr77MJoElAnWZMi9y6H7WzWCyHQsGUeQ7wNES07GANrdN2WspTR3 1HmpF14hS+23axUxZ3hSDxSm72WfEjhhy0v8DOL7ME1F37sOtCBfQj8XhGyUkc3copK2 FPcg== Received: by 10.50.154.167 with SMTP id vp7mr11748530igb.55.1335300289032; Tue, 24 Apr 2012 13:44:49 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp211098ibt; Tue, 24 Apr 2012 13:44:48 -0700 (PDT) Received: by 10.60.3.6 with SMTP id 6mr30066946oey.35.1335300287848; Tue, 24 Apr 2012 13:44:47 -0700 (PDT) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id r10si8996371obn.158.2012.04.24.13.44.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Apr 2012 13:44:47 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Apr 2012 14:44:47 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 24 Apr 2012 14:44:44 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id A3FE83E40051; Tue, 24 Apr 2012 14:44:33 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3OKhtdx094304; Tue, 24 Apr 2012 14:44:11 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3OKhdx7007987; Tue, 24 Apr 2012 14:43:39 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3OKhcPB007862; Tue, 24 Apr 2012 14:43:39 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id DD9CCC05EA; Tue, 24 Apr 2012 13:43:37 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Thomas Gleixner Subject: [PATCH] rtc: Fix possible null pointer dereference in rtc-mpc5121.c Date: Tue, 24 Apr 2012 13:43:35 -0700 Message-Id: <1335300215-21427-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12042420-3352-0000-0000-0000043FC3B3 X-Gm-Message-State: ALoCoQnkMuz61RUkmZ35VC1BnCXQfVihzh3PnckCaHgtoDIU0F7Uw4WVQgz31DgEuw7olWTwZzWT Hey Thomas, This is against tip/timers/urgent for 3.4 thanks -john Mark Loard pointed out: "For example, this beauty from rtc-mpc5121.c in the same update: ... rtc->rtc = rtc_device_register("mpc5200-rtc", &op->dev, &mpc5200_rtc_ops, THIS_MODULE); ... rtc->rtc->uie_unsupported = 1; // <<<< Ooops NULL pointer >>>> if (IS_ERR(rtc->rtc)) { // <<<< this needs to be earlier >>>> err = PTR_ERR(rtc->rtc); goto out_free_irq; } ..." This patch moves setting the uie_unsupported flag to after we validate the rtc->rtc pointer to resolve this. CC: Thomas Gleixner Reported by: Mark Lord Signed-off-by: John Stultz --- drivers/rtc/rtc-mpc5121.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index 42f5f82..029e421 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c @@ -360,12 +360,11 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op) &mpc5200_rtc_ops, THIS_MODULE); } - rtc->rtc->uie_unsupported = 1; - if (IS_ERR(rtc->rtc)) { err = PTR_ERR(rtc->rtc); goto out_free_irq; } + rtc->rtc->uie_unsupported = 1; return 0;