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

Commit 2d726bd7 authored by WANG Cong's avatar WANG Cong Committed by Greg Kroah-Hartman
Browse files

rtnetlink: allocate more memory for dev_set_mac_address() 




[ Upstream commit 153711f9421be5dbc973dc57a4109dc9d54c89b1 ]

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d5d5fac

net/core/rtnetlink.c

+2 −1
Original line number Diff line number Diff line
@@ -1554,7 +1554,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;