From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3397032-1523481537-2-7850846147174949934 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523481536; b=WjY5EsWuE8unPJEk3ZbGHWHMOsF1PvxtfXBCN4JBq9gSqfzSnj 5YipEN0+ekIdCBhzofYbRcrMnYtF26/UE3dblINBiGougDnVub78CtCDDKrtculO BhybXpM/MnSE45JcDH6U3Y4d7+KZxkhbDxHwzbP6eh2SqqhfTM5siLWmY6S71LoZ vwIgq7C0s9lyzJroHc4d+HrhRroLvx1FIQdArxvWMNvo76ptHyB2hP6gltiVzbGV KL7KkO7ng0LSRW1Hr/M1XwYlTRe9EgQ7SQngP7bCkYVjzXrzB4+eXNp0x54c89Lg PKotZyTdlGBBjZebHlgRaXzdfzn7fQLYkN9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523481536; bh=CDMkvAsoc5dgVSIsvBnRDEp+wlI12o SKzZA0lNnGQyA=; b=J/Ijaef0nrC+416+c9cZQ+LtkKZuqdN2H+3ZufqnunIIvS K+ycPtofXMdl7JQc1OQdjVroajMxDmsXx3Rni+11cGJG7bafdf8/DBXbCUaeVjT5 UeYSRs/Dcer85fvBvKg3xZY+WAr/71tq2+9yCypWXPizKOB3vb6eUsTibymfy3ex p2JdJjYxIibQOOarvlvtteSjiQd+j6mZg/VXoJj1OFIAzJnxLPmQM1S57D8jWGUQ GlI3YG66AHYMcJCt4AG26sv3OESRlM3Q8yPf2IHBZRHT+UHPEQ0eh6D0kF4zMVY7 Rt4FkL07IDSuCOa3puG1gzZs43E2m+0rhj5WkdUw== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfHD4bzYTnT93aJP650mDsw2iWD1jniUl5BdpCDM6mBUjf6zi2r1sU+L3M8T26WnGb5f79JgfJ+RD3VB8DPanNCQ7IPtX4q3bMMvKnwzM/9XDmD/H1noM v8ZU5bZsn3TE1MwH2tVALN9xRVvOgoDotvxX8ML9PauTTa5c0nN/uGQqI/WTqy51uU5mQaA5p12lzzsZzezUqCLshjnUqeCcocBaIjcA4PBCsQqA1zOKYBVb X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=DfNHnWVPAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=XsmskROauiS9Y1dqrRkA:9 a=QEXdDO2ut3YA:10 a=rjTVMONInIDnV1a_A2c_:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbeDKSjw (ORCPT ); Wed, 11 Apr 2018 14:39:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56232 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754467AbeDKSju (ORCPT ); Wed, 11 Apr 2018 14:39:50 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 014/121] netxen_nic: set rcode to the return status from the call to netxen_issue_cmd Date: Wed, 11 Apr 2018 20:35:17 +0200 Message-Id: <20180411183457.064363627@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Colin Ian King [ Upstream commit 0fe20fafd1791f993806d417048213ec57b81045 ] Currently rcode is being initialized to NX_RCODE_SUCCESS and later it is checked to see if it is not NX_RCODE_SUCCESS which is never true. It appears that there is an unintentional missing assignment of rcode from the return of the call to netxen_issue_cmd() that was dropped in an earlier fix, so add it in. Detected by CoverityScan, CID#401900 ("Logically dead code") Fixes: 2dcd5d95ad6b2 ("netxen_nic: fix cdrp race condition") Signed-off-by: Colin Ian King Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c @@ -247,7 +247,7 @@ nx_fw_cmd_set_mtu(struct netxen_adapter cmd.req.arg3 = 0; if (recv_ctx->state == NX_HOST_CTX_STATE_ACTIVE) - netxen_issue_cmd(adapter, &cmd); + rcode = netxen_issue_cmd(adapter, &cmd); if (rcode != NX_RCODE_SUCCESS) return -EIO;