| Message ID | 20240531012847.2390529-1-linma@zju.edu.cn (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v1] netfilter: cttimeout: remove 'l3num' attr check | expand |
On Fri, May 31, 2024 at 09:28:47AM +0800, Lin Ma wrote: > After commit dd2934a95701 ("netfilter: conntrack: remove l3->l4 mapping > information"), the attribute of type `CTA_TIMEOUT_L3PROTO` is not used > any more in function cttimeout_default_set. > > However, the previous commit ea9cf2a55a7b ("netfilter: cttimeout: remove > set but not used variable 'l3num'") forgot to remove the attribute > present check when removing the related variable. > > This commit removes that check to ensure consistency. > > Signed-off-by: Lin Ma <linma@zju.edu.cn> Reviewed-by: Simon Horman <horms@kernel.org>
On Fri, May 31, 2024 at 09:28:47AM +0800, Lin Ma wrote: > After commit dd2934a95701 ("netfilter: conntrack: remove l3->l4 mapping > information"), the attribute of type `CTA_TIMEOUT_L3PROTO` is not used > any more in function cttimeout_default_set. > > However, the previous commit ea9cf2a55a7b ("netfilter: cttimeout: remove > set but not used variable 'l3num'") forgot to remove the attribute > present check when removing the related variable. > > This commit removes that check to ensure consistency. Applied to nf-next, thanks
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c index f466af4f8531..eab4f476b47f 100644 --- a/net/netfilter/nfnetlink_cttimeout.c +++ b/net/netfilter/nfnetlink_cttimeout.c @@ -366,8 +366,7 @@ static int cttimeout_default_set(struct sk_buff *skb, __u8 l4num; int ret; - if (!cda[CTA_TIMEOUT_L3PROTO] || - !cda[CTA_TIMEOUT_L4PROTO] || + if (!cda[CTA_TIMEOUT_L4PROTO] || !cda[CTA_TIMEOUT_DATA]) return -EINVAL;
After commit dd2934a95701 ("netfilter: conntrack: remove l3->l4 mapping information"), the attribute of type `CTA_TIMEOUT_L3PROTO` is not used any more in function cttimeout_default_set. However, the previous commit ea9cf2a55a7b ("netfilter: cttimeout: remove set but not used variable 'l3num'") forgot to remove the attribute present check when removing the related variable. This commit removes that check to ensure consistency. Signed-off-by: Lin Ma <linma@zju.edu.cn> --- net/netfilter/nfnetlink_cttimeout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)