Commit 32759da2 authored Apr 07, 2020 by Taehee Yoo Committed by Greg Kroah-Hartman Apr 21, 2020

hsr: check protocol version in hsr_newlink()



[ Upstream commit 4faab8c446def7667adf1f722456c2f4c304069c ]

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: ee1c2797 ("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>

parent 10cea886

net/hsr/hsr_netlink.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -64,10 +64,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);
		}