From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 34BF13290BB for ; Sat, 18 Apr 2026 03:20:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776482445; cv=none; b=ImCq7R0+x8SLw5yds6dADNdwrhGEhBAwrQbs17yYDqKN0ARQZO6hM3W0D6zBMykIf4zW5oY/DBPoekHiNu/yJSVQ9EdvMqM1qsY9XsaFCYd//Hd1CiLFR7rx0E37Ebr2M4iC0pC80cuSI7Y4Q62NZOJjyGh1w78HXnjk3AftJX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776482445; c=relaxed/simple; bh=L4IBni/J1iajRAIevL395+KxOmd1e362KmQQYLHRdHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HoE+LoAnKfoBHi78G1hM2Ejs5Kj49J7GAhNbzh6YolAKxBaJ7b/l8oC63DZqk6DHVDu7KGqvVz7ZH9ZpIVBWhOpNVln5j7FgZrALsUvkfHOG+7+zLCgzWPDiozw5eGCvcskStYiQeoLt2hGbJ/Rpn2/WBZqOTAAD+XsXytTvXlg= 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=UM7UZ+1J; arc=none smtp.client-ip=209.85.210.52 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="UM7UZ+1J" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-7dbb89ab229so1284661a34.1 for ; Fri, 17 Apr 2026 20:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1776482438; x=1777087238; 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=ALXfeG2ZYmCvF5Bsh1WPSjdngqxQrMfwjxGPrrqyViw=; b=UM7UZ+1Jvkv9iqdpSazAVqB64pkldmw9w50eJx91auvTMMtsmSlEGPLLtllS6EROzu dngOkWUCSHxAJgcNAapXm+JTpBCZJ2LCjk59D754gHjhmLqtiCqGzG108Qa3RADcbzmY qBV6Zf8thLxLMK7Kbw4Csixtc9On3AxDALSF0ggd4o3IwceXitIPLVnl7/0SpRer+4t7 kVkyogq6b5veFiClv9btDOOEM5YDNPCnz7mZFCC6q2vqDJPY5G5zyHJyOnUv4Fjmi+Wn J69va+j4Se5+i2mcodV6ikVDkpAmvVw8ZkowH/8GjjsmtlDxh7LVg2mMPtcEV2vKXg6b e3bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776482438; x=1777087238; 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=ALXfeG2ZYmCvF5Bsh1WPSjdngqxQrMfwjxGPrrqyViw=; b=IM9PiGpy35dMna1Y6NxEaTH5o4gtCkKdvy1X+IYvjeIdqZUlIISJOdT553AyFpRabV +JfuZnS5MC46V6rZAGGKoDZoijgxST7COzku92ONny7IaGf3VPy3rpmKmOjo6D1f0PJX j1CRXp1W04b5Fu3BpF6xxSRHZiQS8bA7xrPXLDgLT5IzJ3nFv9fcDesHlGpBiBwa/vWg A/QeRoN8HxEkLpsTxJS4dfYtOLk7gvo+A7vKpLDN5zUoa2JV8TSt3ocMd0ibVmY3Fp1t pRSAbmeJiRzbysJQm8bNQedSOfuvDb8k5ag1n1slhEXj7dUXuOgaLshR38csr0j/SqTM Nh1Q== X-Forwarded-Encrypted: i=1; AFNElJ9QOYWEaaGCgcdN79JgjRMBdWm0NfjPKTRMlCTI0DNXoSptBlGRzOYFWx2v+dSwE1PzLtJ4H8EiWc0gAO0=@vger.kernel.org X-Gm-Message-State: AOJu0YwKiwYSAotCtkY2g6/BwQ3YcnNOIB4AJclVTkUrkeqzfrkTU4DU IT/labyCz+NGKsCjE9CvPLitxGJvWzKJJhKNuEFBBTT0Pkk8jXTso80RKEGIemhudNk= X-Gm-Gg: AeBDietLFoSKf0HDcWy4XIBULh4vIYB3Pe2rIVWQy5I/wwRhuOzsJ9F7kr46DRKbRgf DULakYMxSBqxGPEmbqQYGzLvQ8QeMsP9nQQbdCTSbQkhxGrdGmtrEbo4k5J6ZqBeyisCHuoD9XC QQeAgEutz/WUpU2NKthYtDdDmAYCcAZok/E6UMOw5zo/AnId41WtW45+JeUxxlBHDATKp4ZNGu7 j4BTbJeNR+GvdF8/GJLQ9jh1nUbj4tB+FVgK3qXKZF5Q4xLCsgZSSH1x3VQaMRG4IwrsLt/gp+h F4le9GPFaP/Pm6bRUU1NG2RfOvxgHQg6OTNhd8tGaoY1G4+9LEujP6RZ0vlS4KhSlJa4uY7cMw1 V7K/cq+9TcJo5ud+kDtMHKmhNUKvTAWx7l60LUnfbsN0WBCnmveATs0ZM2oJA4/bKLIEtblN50l UKuWkk7Fro3myHgOqa8VO95FdM7zQ3b0DydElEmuA94Cg= X-Received: by 2002:a05:6830:730e:b0:7d7:fac4:e359 with SMTP id 46e09a7af769-7dc95271248mr3595182a34.27.1776482438240; Fri, 17 Apr 2026 20:20:38 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7dca7b6b5bdsm276902a34.5.2026.04.17.20.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 20:20:37 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: jiri@resnulli.us, jhs@mojatatu.com, horms@kernel.org, Stephen Hemminger , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Dave Taht , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v8 4/6] net/sched: netem: validate slot configuration Date: Fri, 17 Apr 2026 20:19:42 -0700 Message-ID: <20260418032027.900913-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260418032027.900913-1-stephen@networkplumber.org> References: <20260418032027.900913-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 Reject slot configurations that have no defensible meaning: - negative min_delay or max_delay - min_delay greater than max_delay - negative dist_delay or dist_jitter - negative max_packets or max_bytes Negative or out-of-order delays underflow in get_slot_next(), producing garbage intervals. Negative limits trip the per-slot accounting (packets_left/bytes_left <= 0) on the first packet of every slot, defeating the rate-limiting half of the slot feature. Note that dist_jitter has been silently coerced to its absolute value by get_slot() since the feature was introduced; rejecting negatives here converts that silent coercion into -EINVAL. The abs() can be removed in a follow-up. Fixes: 836af83b54e3 ("netem: support delivering packets in delayed time slots") Signed-off-by: Stephen Hemminger --- net/sched/sch_netem.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 556f9747f0e7..640b51be807a 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -827,6 +827,29 @@ static int get_dist_table(struct disttable **tbl, const struct nlattr *attr) return 0; } +static int validate_slot(const struct nlattr *attr, struct netlink_ext_ack *extack) +{ + const struct tc_netem_slot *c = nla_data(attr); + + if (c->min_delay < 0 || c->max_delay < 0) { + NL_SET_ERR_MSG_ATTR(extack, attr, "negative slot delay"); + return -EINVAL; + } + if (c->min_delay > c->max_delay) { + NL_SET_ERR_MSG_ATTR(extack, attr, "slot min delay greater than max delay"); + return -EINVAL; + } + if (c->dist_delay < 0 || c->dist_jitter < 0) { + NL_SET_ERR_MSG_ATTR(extack, attr, "negative dist delay"); + return -EINVAL; + } + if (c->max_packets < 0 || c->max_bytes < 0) { + NL_SET_ERR_MSG_ATTR(extack, attr, "negative slot limit"); + return -EINVAL; + } + return 0; +} + static void get_slot(struct netem_sched_data *q, const struct nlattr *attr) { const struct tc_netem_slot *c = nla_data(attr); @@ -1040,6 +1063,12 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, goto table_free; } + if (tb[TCA_NETEM_SLOT]) { + ret = validate_slot(tb[TCA_NETEM_SLOT], extack); + if (ret) + goto table_free; + } + sch_tree_lock(sch); /* backup q->clg and q->loss_model */ old_clg = q->clg; -- 2.53.0