From patchwork Mon Mar 20 14:08:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 9634255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4C38601E9 for ; Mon, 20 Mar 2017 14:09:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D974527C05 for ; Mon, 20 Mar 2017 14:09:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDB5A27DC2; Mon, 20 Mar 2017 14:09:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D1B127C05 for ; Mon, 20 Mar 2017 14:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BXrxj90X13oekJO+NWKWriR3HoXZACbNPFUVANYD0KU=; b=rYvyIXqWad5Vau pKvfBMJzr8vaZSswV9pV6DKTviDVLKIxRJYEdGZPWkdL84oUNvODr7udgqF++PkBSLVXr+EUiXVX7 29k/IoAl0ePc6wVPvEJScG/9dmai/n9KgVTvwhUDWqQSyF/S1REiVbpH7aVm+66+dIu6BE80ilz9K FW0Buvp4g6+i26yXW8K8SWww6PLwTyXjzlI7XgROJHnLu4fWHNUIlCD25/8AMo1SKPmmBoABkypo1 OEohanSsQ6q6htXzaLVu+y3myiUmlBiHoLnNz0KkpOKFiSKynupkX2aqbnQIKl1ShhwMfVWz3cJBa RU/pJF9a25pWihHapPEg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cpxzz-00033y-Um; Mon, 20 Mar 2017 14:09:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cpxzv-0002y1-Bs; Mon, 20 Mar 2017 14:09:24 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1cpxzP-0002UN-DE; Mon, 20 Mar 2017 14:08:51 +0000 From: Colin King To: Lee Jones , Eric Anholt , Stefan Wahren , Greg Kroah-Hartman , Michael Zoran , Narcisa Ana Maria Vasile , Phil Elwell , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org Subject: [PATCH] staging: vc04_services: fix NULL pointer dereference on pointer 'service' Date: Mon, 20 Mar 2017 14:08:50 +0000 Message-Id: <20170320140850.10570-1-colin.king@canonical.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170320_070923_557489_C13606A9 X-CRM114-Status: UNSURE ( 7.53 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Colin Ian King Currently, if pservice is null then service is set to NULL and immediately afterwards service is dereferenced causing a null pointer dereference. Fix this by bailing out early of the function with a null return. Detected by CoverityScan, CID#1419681 ("Explicit null dereferenced") Signed-off-by: Colin Ian King Acked-by: Stefan Wahren --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index dc9f85c2a5da..4f9e738abddf 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2673,7 +2673,7 @@ vchiq_add_service_internal(VCHIQ_STATE_T *state, if (!pservice) { kfree(service); - service = NULL; + return NULL; } service_quota = &state->service_quotas[service->localport];