Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a73f89a6 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: timeout fixing bug broke SET target special timeout value 



The patch "127f5591 netfilter: ipset: fix timeout value overflow bug"
broke the SET target when no timeout was specified.

Reported-by: default avatarJean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 9e85a6f9

net/netfilter/xt_set.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_set.h>

#include <linux/netfilter/xt_set.h>

#include <linux/netfilter/ipset/ip_set_timeout.h>





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -310,7 +311,8 @@ set_target_v2(struct sk_buff *skb, const struct xt_action_param *par) 
		info->del_set.flags, 0, UINT_MAX);

		info->del_set.flags, 0, UINT_MAX);





	/* Normalize to fit into jiffies */

	/* Normalize to fit into jiffies */

	if (add_opt.timeout > UINT_MAX/MSEC_PER_SEC)

	if (add_opt.timeout != IPSET_NO_TIMEOUT &&

	    add_opt.timeout > UINT_MAX/MSEC_PER_SEC)

		add_opt.timeout = UINT_MAX/MSEC_PER_SEC;

		add_opt.timeout = UINT_MAX/MSEC_PER_SEC;

	if (info->add_set.index != IPSET_INVALID_ID)

	if (info->add_set.index != IPSET_INVALID_ID)

		ip_set_add(info->add_set.index, skb, par, &add_opt);

		ip_set_add(info->add_set.index, skb, par, &add_opt);