Unverified Commit eb2d6d27 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8555 rtnetlink: fix error logic of IFLA_BRIDGE_FLAGS writing back 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JZQSFMEB23PBX3B7BDKEAKU7MS6A2S6Z/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q8N8 
 
Link:https://gitee.com/openeuler/kernel/pulls/8555

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3fa49824 679038a1

net/core/rtnetlink.c

+5 −6
Original line number Diff line number Diff line
@@ -4889,10 +4889,9 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct net *net = sock_net(skb->sk);

	struct ifinfomsg *ifm;

	struct net_device *dev;

	struct nlattr *br_spec, *attr = NULL;

	struct nlattr *br_spec, *attr, *br_flags_attr = NULL;

	int rem, err = -EOPNOTSUPP;

	u16 flags = 0;

	bool have_flags = false;



	if (nlmsg_len(nlh) < sizeof(*ifm))

		return -EINVAL;
@@ -4910,11 +4909,11 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	if (br_spec) {

		nla_for_each_nested(attr, br_spec, rem) {

			if (nla_type(attr) == IFLA_BRIDGE_FLAGS && !have_flags) {

			if (nla_type(attr) == IFLA_BRIDGE_FLAGS && !br_flags_attr) {

				if (nla_len(attr) < sizeof(flags))

					return -EINVAL;



				have_flags = true;

				br_flags_attr = attr;

				flags = nla_get_u16(attr);

			}
@@ -4958,8 +4957,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
		}

	}



	if (have_flags)

		memcpy(nla_data(attr), &flags, sizeof(flags));

	if (br_flags_attr)

		memcpy(nla_data(br_flags_attr), &flags, sizeof(flags));

out:

	return err;

}