diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2017-07-20 21:27:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-11 19:30:14 +0300 |
| commit | 2d726bd73152ab8f0e8b424bd0e3346164343948 (patch) | |
| tree | eeec23caf22d063879561b7b63d98eac3d970253 /net/core | |
| parent | 1d5d5fac1ed73f659a74a548e660a7adc556fb1c (diff) | |
| download | linux-2d726bd73152ab8f0e8b424bd0e3346164343948.tar.xz | |
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: David Ahern <dsahern@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core')
| -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 e1574edf4e43..ff864cefd688 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -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; |