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

Commit a157b9d5 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

netfilter: bridge: fix wrong pointer dereference 



In adf7ff8, a invalid dereference was added in ebt_make_names.

CC [M]  net/bridge/netfilter/ebtables.o
net/bridge/netfilter/ebtables.c: In function `ebt_make_names':
net/bridge/netfilter/ebtables.c:1371:20: warning: `t' may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8be619d1

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,6 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) 
	if (e->bitmask == 0)

		return 0;



	strncpy(name, t->u.target->name, sizeof(name));

	hlp = ubase + (((char *)e + e->target_offset) - base);

	t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);
@@ -1378,6 +1377,7 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) 
	ret = EBT_WATCHER_ITERATE(e, ebt_make_watchername, base, ubase);

	if (ret != 0)

		return ret;

	strncpy(name, t->u.target->name, sizeof(name));

	if (copy_to_user(hlp, name, EBT_FUNCTION_MAXNAMELEN))

		return -EFAULT;

	return 0;