From patchwork Sat Mar 25 13:17:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9644591 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 B4DC8601D7 for ; Sat, 25 Mar 2017 13:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A216B24DA2 for ; Sat, 25 Mar 2017 13:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 949FC26220; Sat, 25 Mar 2017 13:18:04 +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=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E9BF24DA2 for ; Sat, 25 Mar 2017 13:18:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191AbdCYNSD (ORCPT ); Sat, 25 Mar 2017 09:18:03 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:53291 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbdCYNSC (ORCPT ); Sat, 25 Mar 2017 09:18:02 -0400 Received: from localhost.localdomain ([95.91.4.8]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M4Bbn-1c0lPL1R5f-00rn5W; Sat, 25 Mar 2017 14:17:16 +0100 From: Stefan Wahren To: Ulf Hansson , Eric Anholt , Gerd Hoffmann Cc: Jaehoon Chung , Dan Carpenter , linux-rpi-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH] mmc: bcm2835: Fix possible NULL ptr dereference in bcm2835_request Date: Sat, 25 Mar 2017 13:17:00 +0000 Message-Id: <1490447820-751-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 X-Provags-ID: V03:K0:LZd4uH4v4ruLu7MTdbK9VRifdYmJdQK2JZgUudiXe0Up/RhIZKz zfsGCcBMC9EongUleYPAgBKV20ACjFI3gntLymmYBKDKNpYinvHXBFfzVdbr/4Ppr/MXHzv xgqYUt2zYQExeRmHfXaIqTB3fS42KaspAnm8Ljixz/GUf3CQWDNyekVoXP483yBviz12ybZ 5Bi0v+aOh7yHJFESYbHGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:9Y41SN82etE=:FJogQhoVkzgEGB40MpGl5H tDc4+9g2BqRUDDtCJCbozC1a2f4jvz6KPuQA4833p+8ei1Kfkgfg2qFp86CGBB4KG1BUnSwnt ZXjH3zj50FDcwIITOOz/NDLJc2bz7ufa5MB+JBsepjLc/WCiplmCJ9R1RI5SCbcD5bd7y4QTL 6VRI6p8mFw7JS8g6rx0uYMS6eVlBLKuO85d1I4/WcWe1CUe6iwVivZRzzDl7Yt61pvIXMQ28M 6+g0raDJJqWBlR1LSUptfLKZFM11rQR5p8R3xktC1ye4vNPwkcbcRkOpVmg2GzA2GFe99L+mt dx/ENZoIG+yec/herE54bxVqk5iTAKu5G0xirhHsr6uWaIG5Z9ceaP13YSrIjhtbT3iecwV7f 0Ek2qE6YzeaIqys2dhDTUfcZFFxX9tHrp7W8C0Bl+yO55Q7V7JOpPL1+ePV1y77STA/MeZ8cC 58gbPZnMvsfjW5QzSqjA7iUusCqDELwdvgEg0c4bDooL7MbmzRKE/Mv2LJsZpz7XPO2lwitSC T9DbKZ3PsaooPR0TfkXaq3l8Q2/YO71jTbcM7m2Hbo6iehXDjcxTr+HuzCe5IswRhpY7ta1mR ZwwvZDH0u/pWnCtBG+099TJx6mqKqNZUaK+Dt+03YiJHPH4C1z/3Vk6VReky3wN9Fb+0aaDhR DAeJQgIwZ8nlhYB9LTxRpOfgzfkZXmMi90sOV+b7l7vRVLtZzR368wRZCMuyS2PwjkhI= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes a NULL pointer dereference in case of a MMC request with a set block count command and no data. Reported-by: Dan Carpenter Signed-off-by: Stefan Wahren Tested-by: Peter Robinson Reviewed-by: Jaehoon Chung --- drivers/mmc/host/bcm2835.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 7d1b0db..1f343a4 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -1200,7 +1200,8 @@ static void bcm2835_request(struct mmc_host *mmc, struct mmc_request *mrq) return; } - host->use_sbc = !!mrq->sbc && (host->mrq->data->flags & MMC_DATA_READ); + host->use_sbc = !!mrq->sbc && host->mrq->data && + (host->mrq->data->flags & MMC_DATA_READ); if (host->use_sbc) { if (bcm2835_send_command(host, mrq->sbc)) { if (!host->use_busy)