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

Commit 11380557 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Greg Kroah-Hartman
Browse files

netfilter: xt_recent: fix (increase) ipv6 literal buffer length 



[ Upstream commit 7b308feb4fd2d1c06919445c65c8fbf8e9fd1781 ]

in6_pton() supports 'low-32-bit dot-decimal representation'
(this is useful with DNS64/NAT64 networks for example):

  # echo +aaaa:bbbb:cccc:dddd:eeee:ffff:1.2.3.4 > /proc/self/net/xt_recent/DEFAULT
  # cat /proc/self/net/xt_recent/DEFAULT
  src=aaaa:bbbb:cccc:dddd:eeee:ffff:0102:0304 ttl: 0 last_seen: 9733848829 oldest_pkt: 1 9733848829

but the provided buffer is too short:

  # echo +aaaa:bbbb:cccc:dddd:eeee:ffff:255.255.255.255 > /proc/self/net/xt_recent/DEFAULT
  -bash: echo: write error: Invalid argument

Fixes: 079aa88f ("netfilter: xt_recent: IPv6 support")
Signed-off-by: default avatarMaciej Żenczykowski <zenczykowski@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cce1d466

net/netfilter/xt_recent.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ recent_mt_proc_write(struct file *file, const char __user *input, 
{

	struct recent_table *t = PDE_DATA(file_inode(file));

	struct recent_entry *e;

	char buf[sizeof("+b335:1d35:1e55:dead:c0de:1715:5afe:c0de")];

	char buf[sizeof("+b335:1d35:1e55:dead:c0de:1715:255.255.255.255")];

	const char *c = buf;

	union nf_inet_addr addr = {};

	u_int16_t family;