Skip to content

Commit 743ad09

Browse files
f0rm2l1nkuba-moo
authored andcommitted
rtnetlink: fix error logic of IFLA_BRIDGE_FLAGS writing back
In the commit d73ef2d ("rtnetlink: let rtnl_bridge_setlink checks IFLA_BRIDGE_MODE length"), an adjustment was made to the old loop logic in the function `rtnl_bridge_setlink` to enable the loop to also check the length of the IFLA_BRIDGE_MODE attribute. However, this adjustment removed the `break` statement and led to an error logic of the flags writing back at the end of this function. if (have_flags) memcpy(nla_data(attr), &flags, sizeof(flags)); // attr should point to IFLA_BRIDGE_FLAGS NLA !!! Before the mentioned commit, the `attr` is granted to be IFLA_BRIDGE_FLAGS. However, this is not necessarily true fow now as the updated loop will let the attr point to the last NLA, even an invalid NLA which could cause overflow writes. This patch introduces a new variable `br_flag` to save the NLA pointer that points to IFLA_BRIDGE_FLAGS and uses it to resolve the mentioned error logic. Fixes: d73ef2d ("rtnetlink: let rtnl_bridge_setlink checks IFLA_BRIDGE_MODE length") Signed-off-by: Lin Ma <linma@zju.edu.cn> Acked-by: Nikolay Aleksandrov <razor@blackwall.org> Link: https://lore.kernel.org/r/20240227121128.608110-1-linma@zju.edu.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b6c65eb commit 743ad09

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

net/core/rtnetlink.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5169,10 +5169,9 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
51695169
struct net *net = sock_net(skb->sk);
51705170
struct ifinfomsg *ifm;
51715171
struct net_device *dev;
5172-
struct nlattr *br_spec, *attr = NULL;
5172+
struct nlattr *br_spec, *attr, *br_flags_attr = NULL;
51735173
int rem, err = -EOPNOTSUPP;
51745174
u16 flags = 0;
5175-
bool have_flags = false;
51765175

51775176
if (nlmsg_len(nlh) < sizeof(*ifm))
51785177
return -EINVAL;
@@ -5190,11 +5189,11 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
51905189
br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
51915190
if (br_spec) {
51925191
nla_for_each_nested(attr, br_spec, rem) {
5193-
if (nla_type(attr) == IFLA_BRIDGE_FLAGS && !have_flags) {
5192+
if (nla_type(attr) == IFLA_BRIDGE_FLAGS && !br_flags_attr) {
51945193
if (nla_len(attr) < sizeof(flags))
51955194
return -EINVAL;
51965195

5197-
have_flags = true;
5196+
br_flags_attr = attr;
51985197
flags = nla_get_u16(attr);
51995198
}
52005199

@@ -5238,8 +5237,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
52385237
}
52395238
}
52405239

5241-
if (have_flags)
5242-
memcpy(nla_data(attr), &flags, sizeof(flags));
5240+
if (br_flags_attr)
5241+
memcpy(nla_data(br_flags_attr), &flags, sizeof(flags));
52435242
out:
52445243
return err;
52455244
}

0 commit comments

Comments
 (0)