Commit 153711f9 authored Jul 20, 2017 by WANG Cong Committed by David S. Miller Jul 20, 2017

rtnetlink: allocate more memory for dev_set_mac_address()



virtnet_set_mac_address() interprets mac address as struct
sockaddr, but upper layer only allocates dev->addr_len
which is ETH_ALEN + sizeof(sa_family_t) in this case.

We lack a unified definition for mac address, so just fix
the upper layer, this also allows drivers to interpret it
to struct sockaddr freely.

Reported-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent be35e8c5

net/core/rtnetlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2031,7 +2031,8 @@ static int do_setlink(const struct sk_buff *skb,
		struct sockaddr *sa;
		int len;

		len = sizeof(sa_family_t) + dev->addr_len;
		len = sizeof(sa_family_t) + max_t(size_t, dev->addr_len,
		sizeof(*sa));
		sa = kmalloc(len, GFP_KERNEL);
		if (!sa) {
		err = -ENOMEM;

Admin message