diff options
| author | WANG Cong | 2017-07-20 20:27:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-07-21 00:23:22 +0200 |
| commit | 153711f9421be5dbc973dc57a4109dc9d54c89b1 (patch) | |
| tree | 06308fcd9cd16cf966d238f9ee60e6bac1a62e3f /net/core/rtnetlink.c | |
| parent | net: dsa: b53: Add missing ARL entries for BCM53125 (diff) | |
| download | kernel-qcow2-linux-153711f9421be5dbc973dc57a4109dc9d54c89b1.tar.gz kernel-qcow2-linux-153711f9421be5dbc973dc57a4109dc9d54c89b1.tar.xz kernel-qcow2-linux-153711f9421be5dbc973dc57a4109dc9d54c89b1.zip | |
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>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 11b25fbf3dd2..9201e3621351 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -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; |