From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (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 AD0B73BD63C for ; Sat, 9 May 2026 17:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778346697; cv=none; b=r2f5hmLB+On25Y/UOvPcPvwx1gFEwqK7cA34XDbIjVIiKq3NPGM6ScDZfZoIS/Fual5ols3QFGUaoSMQ7zeKIpf1tQ9wmwtcNmUy6hHi07hBlyKLiZ0RfEUXuwezQj3aqlhsyEUkfir3BTKwSJd8nLg8B3c09eAPecYD/8DLiJI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778346697; c=relaxed/simple; bh=Sw43AkoSvDMMeJLAW+KDgGC585WgCfvDTeessNwipiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SYXbXj2QmNBlglrO3qnTtrh9cL+3nHmaoC12LgIRXV/1Gh2iG3gM8jbiFmRlFwTwXRIkicn8IJ3u0iPEv4T+E7Yv7IUFXD8R/X0MYh1KPWfrQYrCS5ODcQjp3GAJK8WTUOI+HWEtKvzQHZdKy+RH5enNezKRaaQA75BCqVA4p3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org; spf=pass smtp.mailfrom=networkplumber.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20251104.gappssmtp.com header.i=@networkplumber-org.20251104.gappssmtp.com header.b=EHGAzw1X; arc=none smtp.client-ip=74.125.82.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20251104.gappssmtp.com header.i=@networkplumber-org.20251104.gappssmtp.com header.b="EHGAzw1X" Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-2f0d3e07e30so7715568eec.0 for ; Sat, 09 May 2026 10:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1778346693; x=1778951493; 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=gphQzyzeWSnwruah36S7urnd3Z4kKtOMsUVtGkgWLLw=; b=EHGAzw1XHfaP6ECTyhVNpQACy/Kv1lSTNhFSvCNmi9eodf5XZiNevsutMYZ+z4Ovfz BIoSL3mvTldbnrWa+hXe/ilSWVVxV0P0q+KnuxuMNZsunrrfo2rtyOb55Ql+U8z352hf EvhCdv7VoQdIM13DDzMPWGiSD7ECJYYNxLY5PXipdjlIEA2BjIwx8zNGDFgD7P4Ndg2a /0UCjAvG4Mi1YfYBIsInRzDWGlJevvS8gGNm6L4M8VAC72inZXQFIN7R1jTVGUZD0YTa 0qfvHNAoxDGh/pRmWKTeJiFXEqoaI7cehbJr/JV/bd16BKicjdO+31Ovkmt4OqsTEPhv 2ADw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778346693; x=1778951493; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gphQzyzeWSnwruah36S7urnd3Z4kKtOMsUVtGkgWLLw=; b=iTIcAX8ARzUZ/ksb0geOcLU/0b5iDrkUZ1z31NMzPqN4M0w0mWajtK6ar7FBZjqfa4 SDdq5rPMDExntBQU7F8pQEHI50MSyRmeBw5MxGmak3/kqT+F0Qi19ahUFnT3O1KIT8b2 GEXRb23Tscnfe/TVl+HsGBht7JUoQoUgY5VRufjBmu0FeE6FFQDEzMC0lEEN2odAdYMN LhZ+YW2haYuroTPBF5EAaDgQHrqWuDRyOC2k6yOtO4KmD0UA9cFStArjG/bjKXG2TiQn ArDoIUHEX7oHJFOOhBxehj7QceK7kecioDLuUs3GreLqx7CAUn/5v87e/H5WTZlxhm0k EFDQ== X-Forwarded-Encrypted: i=1; AFNElJ+6JgFMvHY/3K69XfUtGYyTHIRl0CBpZ4/8rjrwPyRkRiQIuse2mMOrRgmTdRk8Uy6himp9DjRl+XT4xkU=@vger.kernel.org X-Gm-Message-State: AOJu0YzzkmCWAzEh7TIKXpxJjGMC0WWgAvc5BAfyfAGSCN12Iv4OYud6 mSKIMVJQHm2Pa8ipzayA/olRDYti0Ut3YzZHx6WA5kTgzFx5PS8o1m++Z3PwdOvNkwk= X-Gm-Gg: Acq92OEZQs49lS2VoUCL6YcEc6xIxU9JndbF1I2McoL0JRYadmrNyMSTFQDxY5mOzfJ y/EmCNg31gIuiYZ0YO/pWAUZE3QC255G622Jp5IdDZn+P8zAxdzYZ0qQw7bdhG1Jhkql/dkL93y MrQ1mt5eJ0YudmjIX5K6BKvVpuUc8FxyUdBy/9e7XjCxoRCaY1guwqxNZnQJjs30Fi4xauIUtHR fzkO1AEAW0gO8CSBJuiKQOZA/imTbJtfUNQoYGTU60Tuu+6le9ur6xJBcT828AQWKOw4WZNvbrB d70b3f0EhGlhr/VVS2MjtzSwHPe8wpoZua8TYpODqcGALzrM7CMN/QdzFX3RAA9H0qp1qDB7viu vY1W/M7iL9VR/cqhD+9MQ05ROxQF/WlYTkUHh67XSJj5Q4UU9sd1alUq799trgXitrfOawlwkgr mN3UyIED8bZIYFFN0YODU4bTe7F+kZXPTj X-Received: by 2002:a05:693c:3015:b0:2ed:e15:c927 with SMTP id 5a478bee46e88-2f54c0815d7mr9476066eec.35.1778346692790; Sat, 09 May 2026 10:11:32 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2f8859eafcdsm8524568eec.6.2026.05.09.10.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 10:11:32 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: jhs@mojatatu.com, Stephen Hemminger , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v5 4/5] net/sched: netem: handle multi-segment skb in corruption Date: Sat, 9 May 2026 10:03:25 -0700 Message-ID: <20260509171123.307549-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509171123.307549-1-stephen@networkplumber.org> References: <20260509171123.307549-1-stephen@networkplumber.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The packet corruption code only flipped bits in the linear header portion of the skb, skipping corruption when skb_headlen() was zero. Linearize the whole skb if necessary before corruption. Extends d64cb81dcbd5 ("net/sched: sch_netem: fix out-of-bounds access in packet corruption") with a more general solution. Signed-off-by: Stephen Hemminger --- net/sched/sch_netem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index cea6b6182913..699c734e4c8b 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -513,16 +513,17 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, qdisc_qstats_drop(sch); goto finish_segs; } - if (skb->ip_summed == CHECKSUM_PARTIAL && - skb_checksum_help(skb)) { + if (skb_linearize(skb) || + (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))) { qdisc_drop(skb, sch, to_free); skb = NULL; goto finish_segs; } - if (skb_headlen(skb)) - skb->data[get_random_u32_below(skb_headlen(skb))] ^= - 1 << get_random_u32_below(8); + if (skb->len) { + u32 offset = get_random_u32_below(skb->len); + skb->data[offset] ^= 1 << get_random_u32_below(8); + } } if (unlikely(sch->q.qlen >= sch->limit)) { -- 2.53.0