redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

hsr: check protocol version in hsr_newlink() 

[ Upstream commit 4faab8c446 ]

In the current hsr code, only 0 and 1 protocol versions are valid.
But current hsr code doesn't check the version, which is received by
userspace.

Test commands:
    ip link add dummy0 type dummy
    ip link add dummy1 type dummy
    ip link add hsr0 type hsr slave1 dummy0 slave2 dummy1 version 4

In the test commands, version 4 is invalid.
So, the command should be failed.

After this patch, following error will occur.
"Error: hsr: Only versions 0..1 are supported."

Fixes: ee1c279772 ("net/hsr: Added support for HSR v1")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
Taehee Yoo 2020-04-07 13:23:21 +00:00 committed by Greg Kroah-Hartman
parent ced57064a0
commit 22ea267a9c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/hsr/hsr_netlink.c
View File

@ -61,10 +61,16 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev,
else
multicast_spec = nla_get_u8(data[IFLA_HSR_MULTICAST_SPEC]);
if (!data[IFLA_HSR_VERSION])
if (!data[IFLA_HSR_VERSION]) {
hsr_version = 0;
else
} else {
hsr_version = nla_get_u8(data[IFLA_HSR_VERSION]);
if (hsr_version > 1) {
NL_SET_ERR_MSG_MOD(extack,
"Only versions 0..1 are supported");
return -EINVAL;
}
}
return hsr_dev_finalize(dev, link, multicast_spec, hsr_version);
}