Skip to content

Commit 507c2f1

Browse files
borkmannkuba-moo
authored andcommitted
net, neigh: Add build-time assertion to avoid neigh->flags overflow
Currently, NDA_FLAGS_EXT flags allow a maximum of 24 bits to be used for extended neighbor flags. These are eventually fed into neigh->flags by shifting with NTF_EXT_SHIFT as per commit 2c611ad ("net, neigh: Extend neigh->flags to 32 bit to allow for extensions"). If really ever needed in future, the full 32 bits from NDA_FLAGS_EXT can be used, it would only require to move neigh->flags from u32 to u64 inside the kernel. Add a build-time assertion such that when extending the NTF_EXT_MASK with new bits, we'll trigger an error once we surpass the 24th bit. This assumes that no bit holes in new NTF_EXT_* flags will slip in from UAPI, but I think this is reasonable to assume. Suggested-by: David Ahern <dsahern@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: David Ahern <dsahern@kernel.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 20d446f commit 507c2f1

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/core/neighbour.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,9 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
19401940
NL_SET_ERR_MSG(extack, "Invalid extended flags");
19411941
goto out;
19421942
}
1943+
BUILD_BUG_ON(sizeof(neigh->flags) * BITS_PER_BYTE <
1944+
(sizeof(ndm->ndm_flags) * BITS_PER_BYTE +
1945+
hweight32(NTF_EXT_MASK)));
19431946
ndm_flags |= (ext << NTF_EXT_SHIFT);
19441947
}
19451948
if (ndm->ndm_ifindex) {

0 commit comments

Comments
 (0)