From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77746C3F68F for ; Wed, 11 Dec 2019 15:51:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43F2D2073D for ; Wed, 11 Dec 2019 15:51:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576079490; bh=949T9tLkSNjCVzRRQfSWDz2Usy0hw8a+9XTNs6p5Ulw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NPx/caJe/Xgy6cXjqzVPf5QPuqhG2aKC4mv+cVh1qF+t89gtLxWo19qjwQSpeTi7T Ly6UKUett4VDAAT+//Y76rxJNEtyPrPx8hfeiO6zAw8ZHG8Stf7bgLkPMVpWpTf+kU aVs8FVXF2J8VwNAyKI2EhO6N/7OG2CQQPvddoWBk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732579AbfLKPWT (ORCPT ); Wed, 11 Dec 2019 10:22:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:52866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730966AbfLKPWP (ORCPT ); Wed, 11 Dec 2019 10:22:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E5FA2073D; Wed, 11 Dec 2019 15:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077734; bh=949T9tLkSNjCVzRRQfSWDz2Usy0hw8a+9XTNs6p5Ulw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMU+jmuMZUSaz9BC05sewB8m/Vp8poNPTlXz+afScCfh62KJklPJ3j3Bt9D0bnWL5 pmd6hngbje6Y/rEN8NiPYbrvGUoHj5iTwR9TSppSM2Vd7E5AZuGgnSOkWHUmqwGR1O PWjWax0JYlvSh0vH4QlmAIuknib1dILITrD/vKF8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Sasha Levin Subject: [PATCH 4.19 113/243] altera-stapl: check for a null key before strcasecmping it Date: Wed, 11 Dec 2019 16:04:35 +0100 Message-Id: <20191211150346.760317343@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King [ Upstream commit 9ccb645683ef46e3c52c12c088a368baa58447d4 ] Currently the null check on key is occurring after the strcasecmp on the key, hence there is a potential null pointer dereference on key. Fix this by checking if key is null first. Also replace the == 0 check on strcasecmp with just the ! operator. Detected by CoverityScan, CID#1248787 ("Dereference before null check") Fixes: fa766c9be58b ("[media] Altera FPGA firmware download module") Signed-off-by: Colin Ian King Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/misc/altera-stapl/altera.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c index ef83a9078646f..d2ed3b9728b7c 100644 --- a/drivers/misc/altera-stapl/altera.c +++ b/drivers/misc/altera-stapl/altera.c @@ -2176,8 +2176,7 @@ static int altera_get_note(u8 *p, s32 program_size, key_ptr = &p[note_strings + get_unaligned_be32( &p[note_table + (8 * i)])]; - if ((strncasecmp(key, key_ptr, strlen(key_ptr)) == 0) && - (key != NULL)) { + if (key && !strncasecmp(key, key_ptr, strlen(key_ptr))) { status = 0; value_ptr = &p[note_strings + -- 2.20.1