From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9648A84D26; Tue, 14 May 2024 11:43:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686984; cv=none; b=F1DC6E+YLhUKqmermAAS/FTwRP45z4x/XebWBuF0URKcxR9YMxJk5fECrJ/kNJjwZUKr6GA2wWC/H7aRup4MZum+Wt8gTrX3SRZu/FzqSk0YMy7saT+GoDD+v2S7FqApC0ufe4qR7GBaLh38dNDBTbRBpIrP6w9plPmMj5U6H6c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686984; c=relaxed/simple; bh=FqPqFeH7EaqtyE2X9pV0vQtaFBrjhR2NpFALS56h9VQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nTyMbsZJctnxh2+NQTiz/51+2+91KNvIulWBUVeSpnGouRju+homlVK2Snc2e55n9LL0gIDDb5diOqink5BzotPcDVzc64Zn8bXlOB/tfedCgrMGd3Xyam5J2+w3LA/jp1qkXVkT4Qfy8ORG4WHdbZgs6NZTzH8y6kjccpKugzQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r0w/x7AK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="r0w/x7AK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E18ABC2BD10; Tue, 14 May 2024 11:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686984; bh=FqPqFeH7EaqtyE2X9pV0vQtaFBrjhR2NpFALS56h9VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r0w/x7AKqQb/GJ96PrAh4NdCLMwmKrxiQb70p1/Q6/8VrRlBPxL/b/o1nKj5HOT1O 80+uVznRzWRx0liTyInGVKsF5hCZnQfpL39fkzNsXppwlKDWHFUBeQ66D5qaxd8zKH SCTC9h/fu2G44jQVm9inWjtUSDfKXM6DHQ8BUrVg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 25/84] net: qede: use return from qede_parse_flow_attr() for flow_spec Date: Tue, 14 May 2024 12:19:36 +0200 Message-ID: <20240514100952.642802152@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100951.686412426@linuxfoundation.org> References: <20240514100951.686412426@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Asbjørn Sloth Tønnesen [ Upstream commit 27b44414a34b108c5a37cd5b4894f606061d86e7 ] In qede_flow_spec_to_rule(), when calling qede_parse_flow_attr() then the return code was only used for a non-zero check, and then -EINVAL was returned. qede_parse_flow_attr() can currently fail with: * -EINVAL * -EOPNOTSUPP * -EPROTONOSUPPORT This patch changes the code to use the actual return code, not just return -EINVAL. The blaimed commit introduced qede_flow_spec_to_rule(), and this call to qede_parse_flow_attr(), it looks like it just duplicated how it was already used. Only compile tested. Fixes: 37c5d3efd7f8 ("qede: use ethtool_rx_flow_rule() to remove duplicated parser code") Signed-off-by: Asbjørn Sloth Tønnesen Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c index 5041994bf03fb..31223de0c766e 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -2079,10 +2079,9 @@ static int qede_flow_spec_to_rule(struct qede_dev *edev, if (IS_ERR(flow)) return PTR_ERR(flow); - if (qede_parse_flow_attr(edev, proto, flow->rule, t)) { - err = -EINVAL; + err = qede_parse_flow_attr(edev, proto, flow->rule, t); + if (err) goto err_out; - } /* Make sure location is valid and filter isn't already set */ err = qede_flow_spec_validate(edev, &flow->rule->action, t, -- 2.43.0