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,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 3F395C3F2D1 for ; Tue, 3 Mar 2020 18:09:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C565214D8 for ; Tue, 3 Mar 2020 18:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258954; bh=16G+r9AkZmKoMHThPkU6o83ScBvSpFl2idhcFxZGbFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dXt1+DdwBRTLBWXC+GnLY0Q6Clb47nkpoRrTaQEzmp63QO1sQWog3nPenXZlq1m3/ 9aMJ2vxYBXAfD9t7P/1kadRfG2l3xSMXBh/xS99ijON5TUW+XC6b/z6MOWy98XimLk J7lv2+CTzIaGzQr0m3zxhuU5fjDTVHPqHH//Hzu4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731602AbgCCRwz (ORCPT ); Tue, 3 Mar 2020 12:52:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:33234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731067AbgCCRwu (ORCPT ); Tue, 3 Mar 2020 12:52:50 -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 C079B20CC7; Tue, 3 Mar 2020 17:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257970; bh=16G+r9AkZmKoMHThPkU6o83ScBvSpFl2idhcFxZGbFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FK4X/YOrpPLIZ+eWajl71fmqoXc2IPyowZylYUANZgn4qFpkj7+V8muS9Ld054Raq 9kDXCTgS6kZAueIMOFtqfdWPVq1koUjquVJlIZlqdDvwTbAgGrn2SD85cZoxhtDVqB 8RBYPKI5Sa+Fk8dUZqn9153HLhczYIRJOcKWnpl8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Corey Minyard , Sasha Levin Subject: [PATCH 5.4 022/152] ipmi:ssif: Handle a possible NULL pointer reference Date: Tue, 3 Mar 2020 18:42:00 +0100 Message-Id: <20200303174304.982887874@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@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: Corey Minyard [ Upstream commit 6b8526d3abc02c08a2f888e8c20b7ac9e5776dfe ] In error cases a NULL can be passed to memcpy. The length will always be zero, so it doesn't really matter, but go ahead and check for NULL, anyway, to be more precise and avoid static analysis errors. Reported-by: kbuild test robot Signed-off-by: Corey Minyard Signed-off-by: Sasha Levin --- drivers/char/ipmi/ipmi_ssif.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index 22c6a2e612360..8ac390c2b5147 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c @@ -775,10 +775,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, flags = ipmi_ssif_lock_cond(ssif_info, &oflags); msg = ssif_info->curr_msg; if (msg) { + if (data) { + if (len > IPMI_MAX_MSG_LENGTH) + len = IPMI_MAX_MSG_LENGTH; + memcpy(msg->rsp, data, len); + } else { + len = 0; + } msg->rsp_size = len; - if (msg->rsp_size > IPMI_MAX_MSG_LENGTH) - msg->rsp_size = IPMI_MAX_MSG_LENGTH; - memcpy(msg->rsp, data, msg->rsp_size); ssif_info->curr_msg = NULL; } -- 2.20.1