Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp569769ybz; Wed, 22 Apr 2020 03:56:44 -0700 (PDT) X-Google-Smtp-Source: APiQypIGANOiONLz2fu2EFed1Hb44R2BPpGfGzr+r6ISOorJ2ZprRrEwRr4PvLuRisAfTHTJtRK/ X-Received: by 2002:a50:cc87:: with SMTP id q7mr21827767edi.96.1587553004081; Wed, 22 Apr 2020 03:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587553004; cv=none; d=google.com; s=arc-20160816; b=OBFducjh4H6ZaWVi80hY6BemeRZATEicyFDWoN+oJWCWrAqybm4hBuyyvt/WYLWmUZ fVBLz7z1jmuOOH9y0b0lWD+j9KIVBGzEZ0B41MMjUkTowUc1Wr/iqQ/yuGOerjAWYHq8 UrbwD39MBAD/nLQIdP9pZhM2QCjX3l3MrRVPyE2sHwtaIoFs2gmcbZNo3/GK5nllBHU7 EztjeYZ8gQDIEOHITJImcyRvujzb4UVsVx8zef4HleamBogPqt3z3aoZKNzDfouvXYjY zaSS1sUt+EmPovnB4IAF7w6bOT7hlC5VrIaikysUialkBVbjm6sQsfWvUKEdVgrwK8+2 9qYA== 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=Hof0//vFbRCtXkJSsVSDlGWGzCaWMTa6Af3RuXOJ2il3zfYCROW7bgAiyPHmwquo0a dzAr9ovHPU1qPdUKJol5tvK9tUk/MUkwTJZb6vkK88W3eU4EhufuY3jnFJWIWMEGuy57 tfx4b4kQfIF7GNwhyn4C87YL4hzy9J58/7y/MDu8xpt29T+hSZw0HrzqCsavcX1ZWPD0 B2p34+1lPgj5XENWdy3+mF6MD2u8B4Z7zaeCnt/7ZQBfc9AFh1YOz/XH8tkeOhXRMyKO uW6aORHqCl87BxX0FYxmszsc4JfTlDNdpPmta+b43v4Jk/HnmQcb64qVC30wrZXEEAkf vItg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mSX7rqgU; 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 u25si3253965edy.422.2020.04.22.03.56.21; Wed, 22 Apr 2020 03:56:44 -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=mSX7rqgU; 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 S1727785AbgDVKIh (ORCPT + 99 others); Wed, 22 Apr 2020 06:08:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:34082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728713AbgDVKIb (ORCPT ); Wed, 22 Apr 2020 06:08:31 -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 CB06D2075A; Wed, 22 Apr 2020 10:08:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550111; bh=T/a03JFRVwZf26cJQ8+4XA7GcZj1JeU8Ggit0HX5RJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mSX7rqgUCcIH1Z6vZNh/yUjRRYp3BIMf3ZZ34c6CQDGbr/AtADnC3ipYHfgH61dy9 1MzPtAGAUjvf1j68BzhVvvXT+UVQx1Jbb/RFrGBgdTJ62bl6TyXhTY0F4YZvu0wwJh T6zcPKu6GcHSlACcKUhcoQ/bhnfDQlXAn9fD+auY= 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 4.14 006/199] qlcnic: Fix bad kzalloc null test Date: Wed, 22 Apr 2020 11:55:32 +0200 Message-Id: <20200422095058.541192637@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@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