netfilter: uapi: correct UNTRACKED conntrack state bit number
Florian Westphal
maintainerPATCH 1/1 netfilter: uapi: correct UNTRACKED conntrack state bit number
nft_ct exposes this bit to userspace. This used to be
#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_NUMBER + 1)) (IP_CT_NUMBER is 5, so this was 0x40)
.. but this got changed to 8 (0x100) when the untracked object got removed. Replace this with a literal 6 to prevent further incompatible changes in case IP_CT_NUMBER ever increases.
Fixes cc41c84b7e7f2 ("netfilter: kill the fake untracked conntrack objects")
Reported-by Li Shuang <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/netfilter/nf_conntrack_common.h +1 -1
@@ -36,7 +36,7 @@ enum ip_conntrack_info {#define NF_CT_STATE_INVALID_BIT (1 << 0)#define NF_CT_STATE_BIT (ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1)) -#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_UNTRACKED + 1)) +#define NF_CT_STATE_UNTRACKED_BIT (1 << 6)/* Bitset representing status of connection. */ enum ip_conntrack_status {
Signature · 1 line
2.13.6
Quoted 8 lines · Florian Westphal
nft_ctexposes this bit to userspace. This used to be#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_NUMBER + 1)) (IP_CT_NUMBER is 5, so this was 0x40).. but this got changed to 8 (
0x100) when the untracked object got removed. Replace this with a literal 6 to prevent further incompatible changes in caseIP_CT_NUMBERever increases.
Applied, thanks Florian.