From patchwork Tue Feb 18 01:17:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haoxiang Li X-Patchwork-Id: 13978805 X-Patchwork-Delegate: kuba@kernel.org Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2723C749A; Tue, 18 Feb 2025 01:19:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739841583; cv=none; b=slYd2+e5rzr9k3CYtxRsy2jf69zSWjPhyYKftOZJ13AfCkz8r/VoMMdKixM0JzLNxg3wB3EfomAjd4o0Ub8VTshcguRFI5sMsJRqp1fmga54ILt3s5fn9Xir/tGY5FiJBRgpiPGIDHGEXfxZIipS2n4jSF98UDfyOsQ4U2mUFhE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739841583; c=relaxed/simple; bh=c/ZQGdXIfgHE4q3zLhqGd2gcz/q/MQny26xl8zQZnXo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=jtNYIKNCvukBHixBnnXIwd+ATa9tTK7Y6QR+kZvLmGEwf51JXetAUqlVeYgkHzybCyyUR6aO5gsrVr3nhOrCTSq0bPMRZcbh3jr9CNq9MFv3RY/3t0yf7s/vdjaQAvIcTZgDqGxhQs7PiIHiFsRnC/fPUTVuua6esRN86bnR1wM= 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=n55o8bmk; arc=none smtp.client-ip=117.135.210.3 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="n55o8bmk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=1A4W/ wxVhLOVPo5bfmTxi6BeWglYj96/K2R6TB6QL08=; b=n55o8bmkxkVxXAJXBBpp4 UW8Q3PeaNmDgJfA8+UawiKpvwV3W1YV9ABXK8x9Q5vX+5hlYu/7moQle1egFrd03 smAVTHfwAW+z6Mtn3GLFfkVqGZF38gJ+OtoGxt+WCJy6XfP++YPwdiuLoCnmpIvr jA7e7M0LSp5hwz/A8rcS9w= Received: from icess-ProLiant-DL380-Gen10.. (unknown []) by gzga-smtp-mtada-g0-0 (Coremail) with SMTP id _____wDHb+m637NnPp9RNA--.63284S4; Tue, 18 Feb 2025 09:17:48 +0800 (CST) From: Haoxiang Li To: kuba@kernel.org, louis.peens@corigine.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, haoxiang_li2024@163.com, qmo@kernel.org, daniel@iogearbox.net Cc: bpf@vger.kernel.org, oss-drivers@corigine.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() Date: Tue, 18 Feb 2025 09:17:44 +0800 Message-Id: <20250218011744.2397726-1-haoxiang_li2024@163.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wDHb+m637NnPp9RNA--.63284S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7XFy3tr48Zw43Gry7Zr1xAFb_yoWDXrcEkF 129Fnak3yFkr1Ykr4jgw4avr9Fywn0qryruFZxKrZavry7Ar48XrykurZ5AF9rWF4xAFZr X3s7JrWUAa42qjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRNvtCUUUUUU== X-CM-SenderInfo: xkdr5xpdqjszblsqjki6rwjhhfrp/1tbiqQD3bmez3bE5egAAsL X-Patchwork-Delegate: kuba@kernel.org Add check for the return value of nfp_app_ctrl_msg_alloc() in nfp_bpf_cmsg_alloc() to prevent null pointer dereference. Fixes: ff3d43f7568c ("nfp: bpf: implement helpers for FW map ops") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Michal Swiatkowski --- Changes in v2: - remove the bracket for one single-statement. Thanks, Guru! --- drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c index 2ec62c8d86e1..b02d5fbb8c8c 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c @@ -20,6 +20,8 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size) struct sk_buff *skb; skb = nfp_app_ctrl_msg_alloc(bpf->app, size, GFP_KERNEL); + if (!skp) + return NULL; skb_put(skb, size); return skb;