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

Commit adc0a8bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contain Netfilter simple fixes for your net tree,
two one-liner and one two-liner:

1) Oneliner to fix missing spinlock definition that triggers
   'BUG: spinlock bad magic on CPU#' when spinlock debugging is enabled,
   from Florian Westphal.

2) Fix missing workqueue cancelation on IDLETIMER removal,
   from Liping Zhang.

3) Fix insufficient validation of netlink of NFACCT_QUOTA in
   nfnetlink_acct, from Phil Turnbull.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 161de2ca eda3fc50

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_locks); 
__cacheline_aligned_in_smp DEFINE_SPINLOCK(nf_conntrack_expect_lock);

EXPORT_SYMBOL_GPL(nf_conntrack_expect_lock);



static __read_mostly spinlock_t nf_conntrack_locks_all_lock;

static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);

static __read_mostly bool nf_conntrack_locks_all;



void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)

net/netfilter/nfnetlink_acct.c

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl, 
			return -EINVAL;

		if (flags & NFACCT_F_OVERQUOTA)

			return -EINVAL;

		if ((flags & NFACCT_F_QUOTA) && !tb[NFACCT_QUOTA])

			return -EINVAL;



		size += sizeof(u64);

	}

net/netfilter/xt_IDLETIMER.c

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par) 


		list_del(&info->timer->entry);

		del_timer_sync(&info->timer->timer);

		cancel_work_sync(&info->timer->work);

		sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr);

		kfree(info->timer->attr.attr.name);

		kfree(info->timer);