Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1683680ybz; Thu, 16 Apr 2020 13:37:53 -0700 (PDT) X-Google-Smtp-Source: APiQypKx6WPqggqv06zAkwFI7TukamtmH0DS4S0OIodQHXd9PNxBOqJNC3sjma5wLpLCuI/AlpPT X-Received: by 2002:a17:906:f90e:: with SMTP id lc14mr10968742ejb.156.1587069473101; Thu, 16 Apr 2020 13:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587069473; cv=none; d=google.com; s=arc-20160816; b=vFuCNdUzNlSgF7TJ0FjOTR9tojlwx6c11J7ZFDA2ZAy0ht32tnph9iUQL9HGutxKLX HvsOOkS1xxpeUUYpstFnmfbBRP4fvomr2iJ4ryLhHQpZuuzIlEmKB+tf/Ab5lPr5TGwa BCyQZzn5pWfHPEcyzx0TRXgnvcRSfBxTrKkZc21QvYpbIhgNyUCsPxDcWTpZx6JNi0gR 7N5WtwrLlTQpJqixi3LKAYXtJP7c6LjVjA05VeaUd2FJyz3IQo8bZwuPyJpLcSFnByyL vNM9lkc5SJN6yi9AwNxLQAiSW9cpSeIS7gjtTChVq0jgWtvphLyXfVHVjaPp0W/+EgHK Psdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AGYH8D3NzrblnMBo1EPF8zR3Y1a+CNhw1Nm4M39A4Q8=; b=IY5ZDpuhU/tNWYAjOjvKMlPI7Yc+5viNpDOFPuVtK0LXbutfTYHQ7G6/u/yqcmu/5B y2RvF4M9HAfrZeB632sN74W3NjhU0EdchdKeLYuoFrozQG5//srEduC3P2lDDK2T2Spy yhs+3tnTQjZVfF7+1y/vW3V/7lpPbqFIQ0igrm2hyZ8rQD2MHlFIHAuJov6ObLhspG+E eA8mrAGpTxFNHki5Zf3qab7AmEscGXhWRkZ58o17i4/7k9te2PXC1Lb2/KlSANWnq9f1 Q04mVfoq5DkOOlAJkigg5A7HDkOst0ngOKce2ZTGkf4L8uI/3oIqVDkhzxd4gGOM9f5+ FUaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YQtRO5aD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e3si12341792edj.169.2020.04.16.13.37.30; Thu, 16 Apr 2020 13:37:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YQtRO5aD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442709AbgDPPtW (ORCPT + 99 others); Thu, 16 Apr 2020 11:49:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:44082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896662AbgDPNdB (ORCPT ); Thu, 16 Apr 2020 09:33:01 -0400 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 315BB22282; Thu, 16 Apr 2020 13:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043961; bh=T/a03JFRVwZf26cJQ8+4XA7GcZj1JeU8Ggit0HX5RJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQtRO5aDCDnjP8OU9PSjWfPbAeJDN70Wb3qrPM2NtsgOHPSQQonHtg52Jt93IFYbk 15JFTqaHHA66zgt8onpF3TqGNJBeUaa5DSbT3hZFa3aRQf+ObrgYhe6THEiEYXPeKi k1eM8ALOQv61EXf1D/xIh8xHBRhS4xJ4JlVnlq+I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xu Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 024/257] qlcnic: Fix bad kzalloc null test Date: Thu, 16 Apr 2020 15:21:15 +0200 Message-Id: <20200416131328.982279691@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@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: Xu Wang [ Upstream commit bcaeb886ade124331a6f3a5cef34a3f1484c0a03 ] In qlcnic_83xx_get_reset_instruction_template, the variable of null test is bad, so correct it. Signed-off-by: Xu Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index 07f9067affc65..cda5b0a9e9489 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c @@ -1720,7 +1720,7 @@ static int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *p_d ahw->reset.seq_error = 0; ahw->reset.buff = kzalloc(QLC_83XX_RESTART_TEMPLATE_SIZE, GFP_KERNEL); - if (p_dev->ahw->reset.buff == NULL) + if (ahw->reset.buff == NULL) return -ENOMEM; p_buff = p_dev->ahw->reset.buff; -- 2.20.1