From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 50D66314D0D; Mon, 13 Apr 2026 16:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776098761; cv=none; b=pv0TdmS9qyzd5MqSZG265o/W9h1N5Y8XvuVc6zig1n1JK7wzO0CyXyiowEt7dtaDGOlbcT7RuygKV3nvvI8Cy4dlxOJZyHVToInrqqOgPtaj5pz2ROnWd8Qev+Z1P/MR/daqT0evVCvLtEE6YHu0WPiGOjarmr0Je3TaKqsVvek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776098761; c=relaxed/simple; bh=XW+GRrhICwhQz3C2DnP3vpl7xajQ8c+R8nwHyYwrLBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=et1u77hMqqata511SKU03sUGKlSzBxMaFXGt5IJQtO78Ut4tfSWdxaGji4RT88oeg4yZLl5JKeYh4qCc4gYSdOocpXmocsaK4PsTKjqUL1+WcjOPdLg5EUBgww2iOS/JsTNotv9HiJNq0Wqa+CCxQJF/oLzNec3UJSlGqzKHWYQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2RUX8QJB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2RUX8QJB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5D27C2BCB7; Mon, 13 Apr 2026 16:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776098761; bh=XW+GRrhICwhQz3C2DnP3vpl7xajQ8c+R8nwHyYwrLBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2RUX8QJB9TAZPA2U8fCLHRTdSrSxoLOv7l2Ga/peK3oGUjHnbxV2p9XQ7A9ETl9BC wvP7hAb/q4/6ZHemsKjZj4UYxRUROVAtqU18AUgktaY8Z/G9kGv4uLQDceGD8T/k13 291ZMeIrz+fZx7M4HcSrFpmLb7PgU+FFiW97Yxvs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yifan Wu , Juefei Pu , Yuan Tan , Xin Liu , Florian Westphal , Sasha Levin Subject: [PATCH 5.10 079/491] netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels Date: Mon, 13 Apr 2026 17:55:24 +0200 Message-ID: <20260413155822.002836274@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155819.042779211@linuxfoundation.org> References: <20260413155819.042779211@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Tan [ Upstream commit 329f0b9b48ee6ab59d1ab72fef55fe8c6463a6cf ] IDLETIMER revision 0 rules reuse existing timers by label and always call mod_timer() on timer->timer. If the label was created first by revision 1 with XT_IDLETIMER_ALARM, the object uses alarm timer semantics and timer->timer is never initialized. Reusing that object from revision 0 causes mod_timer() on an uninitialized timer_list, triggering debugobjects warnings and possible panic when panic_on_warn=1. Fix this by rejecting revision 0 rule insertion when an existing timer with the same label is of ALARM type. Fixes: 68983a354a65 ("netfilter: xtables: Add snapshot of hardidletimer target") Co-developed-by: Yifan Wu Signed-off-by: Yifan Wu Co-developed-by: Juefei Pu Signed-off-by: Juefei Pu Signed-off-by: Yuan Tan Signed-off-by: Xin Liu Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/xt_IDLETIMER.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c index 2f7cf5ecebf4f..d35ff0a2cad83 100644 --- a/net/netfilter/xt_IDLETIMER.c +++ b/net/netfilter/xt_IDLETIMER.c @@ -320,6 +320,12 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par) info->timer = __idletimer_tg_find_by_label(info->label); if (info->timer) { + if (info->timer->timer_type & XT_IDLETIMER_ALARM) { + pr_debug("Adding/Replacing rule with same label and different timer type is not allowed\n"); + mutex_unlock(&list_mutex); + return -EINVAL; + } + info->timer->refcnt++; mod_timer(&info->timer->timer, msecs_to_jiffies(info->timeout * 1000) + jiffies); -- 2.51.0