diff options
| author | Jakub Urbańczyk <xthaid@gmail.com> | 2020-06-10 11:44:31 +0200 |
|---|---|---|
| committer | Jakub Urbańczyk <xthaid@gmail.com> | 2020-06-13 22:56:25 +0200 |
| commit | 0be6e7d75dbbbfae33c3b51ae7c160d35b228915 (patch) | |
| tree | bce89dc6c75a01809334c591f21ac9c5ab455465 /zebra/zebra_mpls_netlink.c | |
| parent | zebra: clean up netlink api (diff) | |
| download | frr-0be6e7d75dbbbfae33c3b51ae7c160d35b228915.tar.xz frr-0be6e7d75dbbbfae33c3b51ae7c160d35b228915.zip | |
zebra: check for buffer boundary
* Move code encoding Netlink messages to separate functions
* Add buffer bounds checking while creating Nelink messages
Signed-off-by: Jakub Urbańczyk <xthaid@gmail.com>
Diffstat (limited to 'zebra/zebra_mpls_netlink.c')
| -rw-r--r-- | zebra/zebra_mpls_netlink.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c index a9233530d..c95a02163 100644 --- a/zebra/zebra_mpls_netlink.c +++ b/zebra/zebra_mpls_netlink.c @@ -26,13 +26,16 @@ #include "zebra/rt.h" #include "zebra/rt_netlink.h" #include "zebra/zebra_mpls.h" +#include "zebra/kernel_netlink.h" /* * LSP forwarding update using dataplane context information. */ enum zebra_dplane_result kernel_lsp_update(struct zebra_dplane_ctx *ctx) { - int cmd, ret = -1; + uint8_t nl_pkt[NL_PKT_BUF_SIZE]; + ssize_t ret = -1; + int cmd; /* Call to netlink layer based on type of update */ if (dplane_ctx_get_op(ctx) == DPLANE_OP_LSP_DELETE) { @@ -53,7 +56,13 @@ enum zebra_dplane_result kernel_lsp_update(struct zebra_dplane_ctx *ctx) /* Invalid op? */ goto done; - ret = netlink_mpls_multipath(cmd, ctx); + ret = netlink_mpls_multipath_msg_encode(cmd, ctx, nl_pkt, + sizeof(nl_pkt)); + if (ret <= 0) + return ZEBRA_DPLANE_REQUEST_FAILURE; + + ret = netlink_talk_info(netlink_talk_filter, (struct nlmsghdr *)nl_pkt, + dplane_ctx_get_ns(ctx), 0); done: |