netfiler: compat out of scope fix
Subsystems (2)
PATCH 1/1 netfiler: compat out of scope fix
As per 6.2.4(2) when temporary table data goes out of scope, the behaviour is undefined:
if (compat) {
struct foo tmp;
...
private = &tmp;
}
[dereference private]Signed-off-by Alexey Dobriyan <[email protected]>
---
net/ipv4/netfilter/arp_tables.c | 4 ++-- net/ipv4/netfilter/ip_tables.c | 4 ++-- net/ipv6/netfilter/ip6_tables.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
net/ipv4/netfilter/arp_tables.c +2 -2
@@ -925,10 +925,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)if (t && !IS_ERR (t)) {struct arpt_getinfo info;const struct xt_table_info *private = t->private; -#ifdef CONFIG_COMPAT +struct xt_table_info tmp; +if (compat) { -struct xt_table_info tmp; ret =compat_table_info (private, &tmp);xt_compat_flush_offsets (NFPROTO_ARP ); private = &tmp;
net/ipv4/netfilter/ip_tables.c +2 -2
@@ -1137,10 +1137,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)if (t && !IS_ERR (t)) {struct ipt_getinfo info;const struct xt_table_info *private = t->private; -#ifdef CONFIG_COMPAT +struct xt_table_info tmp; +if (compat) { -struct xt_table_info tmp; ret =compat_table_info (private, &tmp);xt_compat_flush_offsets (AF_INET ); private = &tmp;
net/ipv6/netfilter/ip6_tables.c +2 -2
@@ -1169,10 +1169,10 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)if (t && !IS_ERR (t)) {struct ip6t_getinfo info;const struct xt_table_info *private = t->private; -#ifdef CONFIG_COMPAT +struct xt_table_info tmp; +if (compat) { -struct xt_table_info tmp; ret =compat_table_info (private, &tmp);xt_compat_flush_offsets (AF_INET6 ); private = &tmp;
Quoted 9 lines · Alexey Dobriyan
As per 6.2.4(2) when temporary table data goes out of scope, the behaviour is undefined:
if (compat) { struct foo tmp; ... private = &tmp; } [dereference private]
I fixed the changelog to explicitly refer to C99 and applied your patch, thanks.