From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (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 3A05F381AFF; Sat, 9 May 2026 05:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778306383; cv=none; b=L9M89bufDAwREcWVglPwov0kMIAi/aUx9cMdWJycov94auBGfyftCR+4XKDXxxAa4eVPjpx8SM2PPOleyEtTVRkKk4QGGVzJyVa3vJ7h3I7Jo0qg6OvQP6W48up7qmE7cGQoOsVAztLFbF+giRTaAadZcZLHDUfK/jJbatKMVwY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778306383; c=relaxed/simple; bh=03zDnbuy0ge/uTi2WayL2lyjcl0oa2J34OgTRCkXfm0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YCKqF2RJHfaoO0q7NRF+DvoZxxjH7j4Jp3MIKUtOwTUjcTea75sDjDFUQshw7aYxSGYjehXNfYCq/ZkSIc/Y+Y87w/qjjf72chn7a+90S6fjXdkDoDKVJUIbuvDB2jHTpsWfkaUtexgRQGb61uPgHX1DCDYMIVIs9IsNUuDCjr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=XgO/2kq/; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XgO/2kq/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Pw gyqmK18A0yWJ0ebueAVQ3uqfZfErwXx/M3NICsG+M=; b=XgO/2kq/J3MxfoJ1V3 /yoKZmeZxu89HsoySAM8n89aT7O8fLDf5lA5imqwzppZQ9aOvLbqbjRboi1yAHxN 1Bz7wHcEXIWGtgICzz6ZJ6y9v//PRVQCIxbLb+N3dp3diEdLx2n0kXkXWnim5mmK qTyhmMA/w+QHeFXhpmvXxNNbo= Received: from pek-lpg-core5.wrs.com (unknown []) by gzga-smtp-mtada-g1-1 (Coremail) with SMTP id _____wD3XxYWzf5pXJdWAQ--.26500S2; Sat, 09 May 2026 13:58:47 +0800 (CST) From: Robert Garcia To: stable@vger.kernel.org, Dipendra Khadka Cc: Andrew Lunn , Simon Horman , Sunil Goutham , Robert Garcia , Geetha sowjanya , Subbaraya Sundeep , hariprasad , "David S . Miller" , Jakub Kicinski , Naveen Mamindlapalli , Paolo Abeni , Suman Ghosh , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5.15.y] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c Date: Sat, 9 May 2026 13:58:46 +0800 Message-Id: <20260509055846.1893377-1-rob_garcia@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_____wD3XxYWzf5pXJdWAQ--.26500S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww18ZF1fuF43AFWrGw4UArb_yoW8AFW3pa 18ury8ZFy8tF17GwnrX3WrAF4Y9a1vga4UKw18Cw1Fqw13JFn8Cas5KFWrWry8CrWUWFWY qayY9393uF1DJFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pifgArUUUUU= X-CM-SenderInfo: 5uresw5dufxti6rwjhhfrp/xtbDAReS-Wn+zRfMLQAA3V From: Dipendra Khadka [ Upstream commit 5d55ed19d4190d2c210ac05ac7a53f800a8c6fe5 ] Adding error pointer check after calling otx2_mbox_get_rsp(). Fixes: 9917060fc30a ("octeontx2-pf: Cleanup flow rule management") Fixes: f0a1913f8a6f ("octeontx2-pf: Add support for ethtool ntuple filters") Fixes: 674b3e164238 ("octeontx2-pf: Add additional checks while configuring ucast/bcast/mcast rules") Signed-off-by: Dipendra Khadka Reviewed-by: Simon Horman Signed-off-by: Andrew Lunn Signed-off-by: Robert Garcia --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c index c3e5ebc41667..3c46cb0bd0de 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c @@ -119,6 +119,8 @@ int otx2_alloc_mcam_entries(struct otx2_nic *pfvf, u16 count) rsp = (struct npc_mcam_alloc_entry_rsp *)otx2_mbox_get_rsp (&pfvf->mbox.mbox, 0, &req->hdr); + if (IS_ERR(rsp)) + goto exit; for (ent = 0; ent < rsp->count; ent++) flow_cfg->flow_ent[ent + allocated] = rsp->entry_list[ent]; @@ -195,6 +197,10 @@ static int otx2_mcam_entry_init(struct otx2_nic *pfvf) rsp = (struct npc_mcam_alloc_entry_rsp *)otx2_mbox_get_rsp (&pfvf->mbox.mbox, 0, &req->hdr); + if (IS_ERR(rsp)) { + mutex_unlock(&pfvf->mbox.lock); + return PTR_ERR(rsp); + } if (rsp->count != req->count) { netdev_info(pfvf->netdev, -- 2.34.1