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 7CD404F218; Thu, 12 Dec 2024 17:18:49 +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=1734023929; cv=none; b=GlBYymA81SM/uaO+u4JWFtkSciwIuEmfeQa5vDAhivB2YL6qo/Ja93QIlKf44Q8DK8mnYVZnlMlo9SM7PDwzSRxDfnyZ5voOCxbc2LDYxGP5jheAZA9m1FJauNLEh2U/8IQKV4cN5bEVe1jxnfm6HoENfphS4q0M6suSh3spBxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734023929; c=relaxed/simple; bh=Ier/+F8OUatuL18Pz78WdpMP9zJDe+zBaZ1osLdvgME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iq+is4kh8ANmxAqbKCg6Pq3SxsMOWqg0CUJANihcUmJK5yLOnG9Oz/nwLFmKDAklW1mjfYpaZawJb7wmdsWHnt59pUq9QZLLcWYF5XYWIKy8j8qi6TtCcMvDnIkO+iQtTw/hntyc2xmVs6OKxwOLN17JyNJeeJwWNawBpY4hskI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gZvXcRU2; 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="gZvXcRU2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7A7CC4CED0; Thu, 12 Dec 2024 17:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734023929; bh=Ier/+F8OUatuL18Pz78WdpMP9zJDe+zBaZ1osLdvgME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZvXcRU2YrBrcinYQj12Ubedzgai8H7elG5Siooanb4xwxNH6CbeU8dcVHXj89oej In8STgGuoUZ0LzoloVta285pzNMvZnROH/iIb3txf001+EPcF4/RuuQrDm13kds1uc UxtUjOEEGcpUvC8xsXSOtLwbzrR2tjg4OLlxGpfQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dipendra Khadka , Simon Horman , Andrew Lunn , Sasha Levin Subject: [PATCH 5.10 130/459] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_ethtool.c Date: Thu, 12 Dec 2024 15:57:48 +0100 Message-ID: <20241212144258.639571157@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dipendra Khadka [ Upstream commit e26f8eac6bb20b20fdb8f7dc695711ebce4c7c5c ] Add error pointer check after calling otx2_mbox_get_rsp(). Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool") Fixes: d0cf9503e908 ("octeontx2-pf: ethtool fec mode support") Signed-off-by: Dipendra Khadka Reviewed-by: Simon Horman Signed-off-by: Andrew Lunn Signed-off-by: Sasha Levin --- .../net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c index 540a16d0a3274..3d0c090551e76 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c @@ -317,6 +317,11 @@ static void otx2_get_pauseparam(struct net_device *netdev, if (!otx2_sync_mbox_msg(&pfvf->mbox)) { rsp = (struct cgx_pause_frm_cfg *) otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr); + if (IS_ERR(rsp)) { + mutex_unlock(&pfvf->mbox.lock); + return; + } + pause->rx_pause = rsp->rx_pause; pause->tx_pause = rsp->tx_pause; } @@ -847,6 +852,11 @@ static int otx2_set_fecparam(struct net_device *netdev, rsp = (struct fec_mode *)otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr); + if (IS_ERR(rsp)) { + err = PTR_ERR(rsp); + goto end; + } + if (rsp->fec >= 0) pfvf->linfo.fec = rsp->fec; else -- 2.43.0