mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-27 20:33:20 +00:00
zebra: fix incoming FPM message length validation
Validate incoming message length against correct (struct rtmsg) len, not top-level netlink message header size. Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
parent
2871a4e8cb
commit
28d2e126c7
@ -654,14 +654,6 @@ static void fpm_read(struct event *t)
|
||||
hdr_available_bytes = fpm.msg_len - FPM_MSG_HDR_LEN;
|
||||
available_bytes -= hdr_available_bytes;
|
||||
|
||||
/* Sanity check: must be at least header size. */
|
||||
if (hdr->nlmsg_len < sizeof(*hdr)) {
|
||||
zlog_warn(
|
||||
"%s: [seq=%u] invalid message length %u (< %zu)",
|
||||
__func__, hdr->nlmsg_seq, hdr->nlmsg_len,
|
||||
sizeof(*hdr));
|
||||
continue;
|
||||
}
|
||||
if (hdr->nlmsg_len > fpm.msg_len) {
|
||||
zlog_warn(
|
||||
"%s: Received a inner header length of %u that is greater than the fpm total length of %u",
|
||||
@ -691,6 +683,14 @@ static void fpm_read(struct event *t)
|
||||
|
||||
switch (hdr->nlmsg_type) {
|
||||
case RTM_NEWROUTE:
|
||||
/* Sanity check: need at least route msg header size. */
|
||||
if (hdr->nlmsg_len < sizeof(struct rtmsg)) {
|
||||
zlog_warn("%s: [seq=%u] invalid message length %u (< %zu)",
|
||||
__func__, hdr->nlmsg_seq,
|
||||
hdr->nlmsg_len, sizeof(struct rtmsg));
|
||||
break;
|
||||
}
|
||||
|
||||
ctx = dplane_ctx_alloc();
|
||||
dplane_ctx_route_init(ctx, DPLANE_OP_ROUTE_NOTIFY, NULL,
|
||||
NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user