From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D6793B3C03 for ; Thu, 18 Jun 2026 08:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.99 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781771854; cv=none; b=oHIg24fIAeqh51Ac2GIJ1TGsrUfPrH0zRyEWRqv15eZuRICWSJtQF3Y5yYcSqbsMUvffGStnLH9O/npBr4qpnjff+m0geyogBjURJjOhQdAf7cD9ospTRkv1o/Ad9PdzYyCD4IOVhrwLKMkjOXPIvpjI/mkNlEr+toDBhsjtcSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781771854; c=relaxed/simple; bh=pOwuoiQjzretG7oDfDmFYA3hIp2H88a2vhblAg1egbk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R2CkqTUwYtUcXIpp3Fgbu2+qIyk12sIk7C8yfje9qbibKMkx47Daox1/xZxflRBHf+zTePnb6WtQdrGrtd+5iSmSMFo74Z7vigXn5DqY20OgPLg8DqQAcRtDBjxBMHJxqZboudOxZ+w3hnf7qrs0FktmVK3Wq7gfVc0no+I+9kM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Z3PbnRG7; arc=none smtp.client-ip=209.85.216.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Z3PbnRG7" Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-37ce68a54f8so246136a91.0 for ; Thu, 18 Jun 2026 01:37:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781771853; x=1782376653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ali2EOfmsyhEzhaOAaUOh+zn1fjnnog9jkuNp7bauLU=; b=oJkXvSQFymyK/jh/bEdR15lw1ozVEe2l0ozxP712oQjApdJqxBAWH9Nfe25/Ko69aF b3B1/Nw/1T4FEGr1TLyLnjuj4Gyfpk5+TYbes7+sPHNhVV8kj1skLSBDbHC2S+k76FQ4 XJWu2Y/uN6LCVJckqJ08OE9lcTIij6MzVVsdYsvtgVjhj3pg6AdlBE5N6Sk3/jdAeTqo W2OT81ElSte6bDTjtEo6GrfGGdz6nKVFwZ/5SqgWDOU7Nkx5UDrFsgeFrIbBaYtS3jtm vc50rBbTRL1GaKeb09tUWX66slETQz7XTOdkltkzyrCWCbyz9YrNPLnQJZPUmfcSaWI9 84DQ== X-Forwarded-Encrypted: i=1; AFNElJ/yA66WPLGQ5ZAK/schUvY4EWes+EWvK5rDhEryDL5wk6ICS+Ky/a4a7cfIuyKWG2OSgjsBCzH0rTR2YoQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwY4Xzy1Gx0WVsWF0fL/Uu9AKIVypCusDx41FWXiWvTQNEZpxcL M3JL098dCa9KzylSYtsCvkxFGnPTYqZRhHqYA6ypG8PBqEE+i+zpLpmy+DuoPKeyISIdluOqwKg pphmRGTxJT5V4KcdYgM/Urcn0rGHHuBjkU+XmlDTxDiwMxgK6EHF/tK/li5BYZLviBD42K/n+5Z q/2NiyhvLISgtDcUhPrKCyPtMn6CNtP2QTWDWizMaRLSKWR2mRuSUaaGRS5I47cP07eleglmYSm AqdGwttZ0Rr1CZDpmLYNQ7XWg== X-Gm-Gg: AfdE7cnBkqlO0odlimLHcmE65vc/bVwC7y4VMmxcKejqfkiqgGdfTde+UVj5/BsGglx MNFWBo/MjcPd2SO5kYqd7q88Ub40KNQixM7wsC7J/CF3nqRmZBcVyA/x676JbaqfpnpxyMvbHiF omb5DI57HfwbWxD5sAhu5F+BUTxbXkA7xTKTPjV/JDZjSMNzrAQh6yTPy8WVpEdTH9EF9XM4+QP JhClHaVlNFOwcKJDXM4yH44NBGZygdXqg1K1WRNUoD8hveym67DrqtKzLRb0mGMMl3n6ZFZU7Vp AP0+dsPD8IN7w+g2YKau1t3fH+NNLk9bk1nMajrONV4Hf3aK1MUHMgodHKdUQCn28Q4/4d1fLG+ 1CrFVMUmEnFgxpsYi4vUeCC4SvaFOPsDJPBmwzO6InxD5QzueND87xBPWlIImZfcCoXWsRmiSlL /Xwka/A0oaxnyoupfEy2a+jBb3QwRf6jW6i3wF9OXYxK43TujFNA== X-Received: by 2002:a17:90b:584b:b0:36d:5dbe:2a0d with SMTP id 98e67ed59e1d1-37c9da9df7dmr7020409a91.7.1781771852701; Thu, 18 Jun 2026 01:37:32 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-23.dlp.protect.broadcom.com. [144.49.247.23]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-37c521d7c31sm767995a91.3.2026.06.18.01.37.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2026 01:37:32 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-30bdfcf7c14so2894735eec.0 for ; Thu, 18 Jun 2026 01:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1781771851; x=1782376651; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ali2EOfmsyhEzhaOAaUOh+zn1fjnnog9jkuNp7bauLU=; b=Z3PbnRG7RwUZNKm8nE+twtL1ioxcp80xQhoiFoIcELbKVpRmTdeTtHkO4hnauimVlf PciG5XllfT0QaCFWHvr2+6euHEIk4+xeeMeHFKVAt8+zjcGkeri75tbkDv/bi9FDbgOu 97VjlMarbuULn1IId0mSY0ytf/8NO9HZDSg60= X-Forwarded-Encrypted: i=1; AFNElJ+a7Gp+od7Xt14/gCnsyAKk2r+PJRjnmJqNsIFKBtj1gCOYLl5wegTJfxxu8PJQy14wYdeS0liBTdjA8E4=@vger.kernel.org X-Received: by 2002:a05:7300:8608:b0:30b:c6f0:1cd9 with SMTP id 5a478bee46e88-30bca0cd6e3mr4005743eec.26.1781771850887; Thu, 18 Jun 2026 01:37:30 -0700 (PDT) X-Received: by 2002:a05:7300:8608:b0:30b:c6f0:1cd9 with SMTP id 5a478bee46e88-30bca0cd6e3mr4005706eec.26.1781771850085; Thu, 18 Jun 2026 01:37:30 -0700 (PDT) Received: from shivania.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e48e412sm27475037eec.4.2026.06.18.01.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 01:37:29 -0700 (PDT) From: Shivani Agarwal To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, xiaosuo@gmail.com, iri@resnulli.us, jhs@mojatatu.com, ajay.kaher@broadcom.com, alexey.makhalov@broadcom.com, vamsi-krishna.brahmajosyula@broadcom.com, yin.ding@broadcom.com, tapas.kundu@broadcom.com, Bin Lan , Shivani Agarwal Subject: [PATCH v5.10 1/2] net: add skb_header_pointer_careful() helper Date: Thu, 18 Jun 2026 01:08:06 -0700 Message-Id: <20260618080807.1269070-2-shivani.agarwal@broadcom.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260618080807.1269070-1-shivani.agarwal@broadcom.com> References: <20260618080807.1269070-1-shivani.agarwal@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e From: Eric Dumazet [ Upstream commit 13e00fdc9236bd4d0bff4109d2983171fbcb74c4 ] This variant of skb_header_pointer() should be used in contexts where @offset argument is user-controlled and could be negative. Negative offsets are supported, as long as the zone starts between skb->head and skb->data. Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20260128141539.3404400-2-edumazet@google.com Signed-off-by: Jakub Kicinski [ Adjust context ] Signed-off-by: Bin Lan Signed-off-by: Greg Kroah-Hartman [ Shivani: Modified to apply on 5.10.y ] Signed-off-by: Shivani Agarwal --- include/linux/skbuff.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 8abbb64bd..a2daeba8b 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3686,6 +3686,18 @@ skb_header_pointer(const struct sk_buff *skb, int offset, int len, void *buffer) skb_headlen(skb), buffer); } +/* Variant of skb_header_pointer() where @offset is user-controlled + * and potentially negative. + */ +static inline void * __must_check +skb_header_pointer_careful(const struct sk_buff *skb, int offset, + int len, void *buffer) +{ + if (unlikely(offset < 0 && -offset > skb_headroom(skb))) + return NULL; + return skb_header_pointer(skb, offset, len, buffer); +} + /** * skb_needs_linearize - check if we need to linearize a given skb * depending on the given device features. -- 2.53.0