Jesper Dangaard Brouer f14e31c169 netfilter: conntrack: fix reading nf_conntrack_buckets ... commit f6351c3f1c27c80535d76cac2299aec44c36291e upstream. The old way of changing the conntrack hashsize runtime was through changing the module param via file /sys/module/nf_conntrack/parameters/hashsize. This was extended to sysctl change in commit 3183ab8997 ("netfilter: conntrack: allow increasing bucket size via sysctl too"). The commit introduced second "user" variable nf_conntrack_htable_size_user which shadow actual variable nf_conntrack_htable_size. When hashsize is changed via module param this "user" variable isn't updated. This results in sysctl net/netfilter/nf_conntrack_buckets shows the wrong value when users update via the old way. This patch fix the issue by always updating "user" variable when reading the proc file. This will take care of changes to the actual variable without sysctl need to be aware. Fixes: 3183ab8997 ("netfilter: conntrack: allow increasing bucket size via sysctl too") Reported-by: Yoel Caspersen <yoel@kviknet.dk> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2021-01-19 18:27:33 +01:00
..
6lowpan
9p	net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid	2020-10-12 10:05:47 +02:00
802
8021q	net: vlan: avoid leaks on register_vlan_dev() failures	2021-01-17 14:16:55 +01:00
appletalk
atm	net: atm: fix update of position index in lec_seq_next	2020-10-31 12:26:30 -07:00
ax25
batman-adv	batman-adv: Don't always reallocate the fragmentation skb head	2020-11-27 08:02:55 +01:00
bluetooth	Bluetooth: Fix attempting to set RPA timeout when unsupported	2021-01-09 13:46:23 +01:00
bpf	bpf: fix raw_tp test run in preempt kernel	2020-09-30 08:34:08 -07:00
bpfilter	Revert "bpfilter: Fix build error with CONFIG_BPFILTER_UMH"	2020-10-15 12:33:24 -07:00
bridge	bridge: Fix a deadlock when enabling multicast snooping	2020-12-07 17:14:43 -08:00
caif
can	can: isotp: isotp_getname(): fix kernel information leak	2021-01-17 14:17:05 +01:00
ceph	libceph: clear con->out_msg on Policy::stateful_server faults	2020-10-12 15:29:27 +02:00
core	net: drop bogus skb with CHECKSUM_PARTIAL and offset beyond end of trimmed packet	2021-01-17 14:17:06 +01:00
dcb	net: DCB: Validate DCB_ATTR_DCB_BUFFER argument	2020-09-10 15:09:08 -07:00
dccp	tcp: fix race condition when creating child sockets from syncookies	2020-11-23 16:32:33 -08:00
decnet
dns_resolver
dsa	net: dsa: tag_ksz: KSZ8795 and KSZ9477 also use tail tags	2020-10-19 17:32:50 -07:00
ethernet
ethtool	ethtool: fix string set id check	2021-01-06 14:56:48 +01:00
hsr	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
ieee802154	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
ife
ipv4	nexthop: Bounce NHA_GATEWAY in FDB nexthop groups	2021-01-17 14:16:57 +01:00
ipv6	net: ipv6: fib: flush exceptions when purging route	2021-01-17 14:16:56 +01:00
iucv	net/af_iucv: set correct sk_protocol for child sockets	2020-11-21 14:43:45 -08:00
kcm
key
l2tp	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
l3mdev
lapb
llc
mac80211	mac80211: fix a mistake check for rx_stats update	2020-12-30 11:53:50 +01:00
mac802154
mpls	mpls: load mpls_gso after mpls_iptunnel	2020-10-20 21:16:45 -07:00
mptcp	mptcp: fix security context on server socket	2021-01-06 14:56:48 +01:00
ncsi	net/ncsi: Use real net-device for response handler	2021-01-12 20:18:10 +01:00
netfilter	netfilter: conntrack: fix reading nf_conntrack_buckets	2021-01-19 18:27:33 +01:00
netlabel	netlabel: fix an uninitialized warning in netlbl_unlabel_staticlist()	2020-11-14 12:07:57 -08:00
netlink	netlink: export policy in extended ACK	2020-10-09 20:22:32 -07:00
netrom
nfc	nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download()	2020-10-20 17:06:22 -07:00
nsh
openvswitch	openvswitch: fix error return code in validate_and_copy_dec_ttl()	2020-12-04 15:43:14 -08:00
packet	net/packet: fix packet receive on L3 devices without visible hard header	2020-11-23 17:29:36 -08:00
phonet
psample	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
qrtr	net: qrtr: ns: Fix the incorrect usage of rcu_read_lock()	2020-10-06 06:01:35 -07:00
rds	RDMA: Add rdma_connect_locked()	2020-10-28 09:14:49 -03:00
rfkill	rfkill: Fix use-after-free in rfkill_resume()	2020-11-12 09:18:06 +01:00
rose	rose: Fix Null pointer dereference in rose_send_frame()	2020-11-20 10:04:58 -08:00
rxrpc	rxrpc: Fix loss of final ack on shutdown	2020-10-15 13:28:00 +01:00
sched	net: sched: prevent invalid Scell_log shift count	2021-01-12 20:18:12 +01:00
sctp	sctp: change to hold/put transport for proto_unreach_timer	2020-11-14 11:57:12 -08:00
smc	net/smc: fix direct access to ib_gid_addr->ndev in smc_ib_determine_gid()	2020-11-19 10:59:19 -08:00
strparser
sunrpc	net: sunrpc: interpret the return value of kstrtou32 correctly	2021-01-19 18:27:33 +01:00
switchdev	net: switchdev: Fixed kerneldoc warning	2020-09-23 17:46:31 -07:00
tipc	net: tipc: prevent possible null deref of link	2020-12-08 15:53:41 -08:00
tls	net/tls: Protect from calling tls_dev_del for TLS RX twice	2020-11-25 17:31:06 -08:00
unix	networking changes for the 5.10 merge window	2020-10-15 18:42:13 -07:00
vmw_vsock	vsock/virtio: discard packets only when socket is really closed	2020-11-23 16:36:29 -08:00
wimax	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
wireless	cfg80211: select CONFIG_CRC32	2021-01-19 18:27:28 +01:00
x25	net/x25: prevent a couple of overflows	2020-12-02 17:26:36 -08:00
xdp	xsk: Rollback reservation at NETDEV_TX_BUSY	2021-01-17 14:17:05 +01:00
xfrm	net: xfrm: fix memory leak in xfrm_user_policy()	2020-11-10 09:14:25 +01:00
compat.c	iov_iter: transparently handle compat iovecs in import_iovec	2020-10-03 00:02:13 -04:00
devres.c
Kconfig	drop_monitor: Convert to using devlink tracepoint	2020-09-30 18:01:26 -07:00
Makefile
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
sysctl_net.c