From: David S. Miller Date: Mon, 21 Nov 2022 11:28:07 +0000 (+0000) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.1~81^2~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2158cfb076c7b3c0544380daef67dcb47e7988a2;p=platform%2Fkernel%2Flinux-starfive.git Merge git://git./linux/kernel/git/netfilter/nf Pablo Neira Ayuso says: ==================== The following patchset contains late Netfilter fixes for net: 1) Use READ_ONCE()/WRITE_ONCE() to update ct->mark, from Daniel Xu. Not reported by syzbot, but I presume KASAN would trigger post a splat on this. This is a rather old issue, predating git history. 2) Do not set up extensions for set element with end interval flag set on. This leads to bogusly skipping this elements as expired when listing the set/map to userspace as well as increasing memory consumpton when stateful expressions are used. This issue has been present since 4.18, when timeout support for rbtree set was added. ==================== Signed-off-by: David S. Miller --- 2158cfb076c7b3c0544380daef67dcb47e7988a2