From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f228.google.com (mail-dy1-f228.google.com [74.125.82.228]) (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 9372B35AC0C for ; Fri, 19 Jun 2026 09:58:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.228 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781863089; cv=none; b=jFmfPk+xeLRJHv3qv2glWnT7enmjZ5n6nEicyAVt3ZMTvHjJ/ncAHB0NScwg7LlbVhqCgdn9Gp0f7B5Z03hJBE0szc9vjX9BG+l1jc9vLda54psX/ilNerB33gogpIaAtw3SDDL7F1FY5CybF6UPEUFsqWIQ8szEAL3BcifLfaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781863089; c=relaxed/simple; bh=gnqYplrvnOKhysmkaWxCDnkGO5zvC2BvTJjxuHPuzak=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YPkkdol6109Ujr37MBmJppQLgYNPC27WxNkGc0h2JmSVyTrjKqhHAmKqoZSy1mIn0q5+Xnghq2BwZpNeirDMeBmlC+uxz9xM7ZffkFO1K+jLVZeDo9nMzQomPo2P6QA6imu6ulCImu8uqHI15IseBIiKDnuLo9Z2kf5V/1H8ZHc= 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=fBWlcLhg; arc=none smtp.client-ip=74.125.82.228 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="fBWlcLhg" Received: by mail-dy1-f228.google.com with SMTP id 5a478bee46e88-30bb7d20ad9so2811801eec.1 for ; Fri, 19 Jun 2026 02:58:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781863084; x=1782467884; 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=RMj6/kEzjl1ru5UHUZhZ/YyeC10jEp1W8ogblv+QKRE=; b=Yd8uLIG7vLPGOk3dcRRwNg2hRub+u7/A41oCsjxn4VT27sWu5nQBrJ8lBbShD9F8LM nIcvr5LFRm40Bq1biQZjpgxZRCnw5Eo2fOc2kPFrFcd2xGBVxUArQ53SShXs0bSvJrJL UIQu5fgE3XHSgghmMUaMXP6fw3bZuk5SpsiHKa7Z9ciqFICnVtW/fTnoiXEHni05kaI3 /caHWRSb0wb6atK/K+iV7wE717SxH7b/keEdK7/ywv3unPaF3y0UCQdjBWiZj+Gykznd b+eEyfJjKj3zKar2yw9alxVpP55S0V1G4/XYk/mhMeprJ0RpjTQrp9X5W8ZIRjk6Wrsx nYBA== X-Forwarded-Encrypted: i=1; AFNElJ+16IQpzVFDnaQHAQeivuxMRrOM5ESF42in4z0l88UsNIFrhy8AI6Wv+5GdlUSzK8HE2klmmp5G1XNZteE=@vger.kernel.org X-Gm-Message-State: AOJu0YxO8r/cTRAnhfo7lcgbXKeBTe7NE3++7ikmiqWceq8Ulq83Iry7 eH352vsEOMyjZ+dD8LRPIOZy56AGj8292/pDds76UWNV5TIF5brn7SviUspbF/SIQg8A2EkvaYc XcqiVualTd3G2zgkA/rvl/1NET8kD0Ht0ZDPBFUWx1JJFVurHZmtIBKEKTIMQBS5sxo+CU9HGlh WMxKejRIMS5/IJkIgOGlukKXXPRUQPIsDaUoGEme9lkr+UUzWsyHMuDzB+SOMmHbkQ0XdAZb1zU y27zG1fLFM7WXNR9oP1Vz3ojw== X-Gm-Gg: AfdE7cn8kbDKyq4BD2lCsOroQ2ZJVEWCdgxhRGIw21JDImBGZSs9kbImLgMaawOtoJ+ Yj5v7KEousY7NqEpjYEUTWASFKkJIyA6OD4uL/WUGn10d1rBr81Z4u9XNWCjKbrgq0nZHC1B9ls ELoVF/sbf5auNzLDl7iAiQX3Jp2STXxT3BGYWYHR0i3Trh0k3MfPx7y2UO6CvY7DbBMADcq1dvV M8/m4gYWJqLJllzKnxxeel/fDhTAAzWHA+O/85oteLuhTjShDfcKK6nWpxKzCcnThjXKRF7dIBK nklciG0tOUhmku8LsnGkXO091jzv1lw8OaiLUFB9+JiPmIigbwB7oyZKXCCzmNq+ZsGv0XcGotm 4ZRm0xbQYpL5VPXg+UR/D+L/vdPkM17NbsejVZLKDr7K5NcjTV5Eues1VJclS0MrjTkV68IUCRL GfK/lFyaq0/Q5Vt8BXEVlnzEwrWV8BNAdCXUh1oITZkJYfQaiMIQ== X-Received: by 2002:a05:7300:1491:b0:307:26a3:75d2 with SMTP id 5a478bee46e88-30c06fb352bmr1709120eec.7.1781863084317; Fri, 19 Jun 2026 02:58:04 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-29.dlp.protect.broadcom.com. [144.49.247.29]) by smtp-relay.gmail.com with ESMTPS id 5a478bee46e88-30c06c282f7sm150614eec.21.2026.06.19.02.58.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jun 2026 02:58:04 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-30c13bb8ca9so206607eec.0 for ; Fri, 19 Jun 2026 02:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1781863082; x=1782467882; 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=RMj6/kEzjl1ru5UHUZhZ/YyeC10jEp1W8ogblv+QKRE=; b=fBWlcLhg3ibLg8bQ2t+y575N2+gSZdK2g7DRufLaD/Tj21kPkORhk+22bFVm9UyqMT oKnvIFreEsE2W2dKL3YILirDv2CSUJUsfXVEp1Jc9+GBz2LuPodAPGXt3JcC1abJG4a0 BAbZ6mfTSZcd2QSEkWnJCQPMiqAw9nIYbWPMU= X-Forwarded-Encrypted: i=1; AFNElJ+14Vbuuo62qx1R8Tubc/S2HyHETS8KTUl8NT1OCaCUwxr9Z2CATATNTJUMAJzR2GhKaAqu3h6hr16XT4s=@vger.kernel.org X-Received: by 2002:a05:7300:cd8d:b0:30b:bda8:a70b with SMTP id 5a478bee46e88-30c06fb6c08mr1706537eec.4.1781863082612; Fri, 19 Jun 2026 02:58:02 -0700 (PDT) X-Received: by 2002:a05:7300:cd8d:b0:30b:bda8:a70b with SMTP id 5a478bee46e88-30c06fb6c08mr1706518eec.4.1781863082047; Fri, 19 Jun 2026 02:58:02 -0700 (PDT) Received: from shivania.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30c06d5bec5sm1851910eec.26.2026.06.19.02.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2026 02:58:01 -0700 (PDT) From: Shivani Agarwal To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: pablo@netfilter.org, fw@strlen.de, phil@nwl.cc, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ajay.kaher@broadcom.com, alexey.makhalov@broadcom.com, vamsi-krishna.brahmajosyula@broadcom.com, yin.ding@broadcom.com, tapas.kundu@broadcom.com, Shivani Agarwal Subject: [PATCH v6.1 1/3] netfilter: nf_tables: always increment set element count Date: Fri, 19 Jun 2026 02:28:48 -0700 Message-Id: <20260619092850.1274076-2-shivani.agarwal@broadcom.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260619092850.1274076-1-shivani.agarwal@broadcom.com> References: <20260619092850.1274076-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: Florian Westphal [ Upstream commit d4b7f29eb85c93893bc27388b37709efbc3c9a0e ] At this time, set->nelems counter only increments when the set has a maximum size. All set elements decrement the counter unconditionally, this is confusing. Increment the counter unconditionally to make this symmetrical. This would also allow changing the set maximum size after set creation in a later patch. Signed-off-by: Florian Westphal [ Shivani: Modified to apply on 6.1.y ] Signed-off-by: Shivani Agarwal --- net/netfilter/nf_tables_api.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 0c4224282..ec4bfe53b 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -6670,10 +6670,13 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, goto err_element_clash; } - if (!(flags & NFT_SET_ELEM_CATCHALL) && set->size && - !atomic_add_unless(&set->nelems, 1, set->size + set->ndeact)) { - err = -ENFILE; - goto err_set_full; + if (!(flags & NFT_SET_ELEM_CATCHALL)) { + unsigned int max = set->size ? set->size + set->ndeact : UINT_MAX; + + if (!atomic_add_unless(&set->nelems, 1, max)) { + err = -ENFILE; + goto err_set_full; + } } nft_trans_elem(trans) = elem; -- 2.53.0