netlink: data lifetime error fixes
Subsystems (2)
cover netlink: data lifetime error fixes
Fixes of two data lifetime bugs found by testing with valgrind: one use after free, one memory leak.
Michal Kubecek (2):
netlink: fix use after free in netlink_run_handler()
netlink: fix leaked instances of struct nl_socket
netlink/netlink.c | 21 +++++++++++++++------ netlink/nlsock.c | 3 +++ 2 files changed, 18 insertions(+), 6 deletions(-)
Signature · 1 line
2.29.2
PATCH 1/2 netlink: fix use after free in netlink_run_handler()
Valgrind detected use after free in netlink_run_handler(): some members of struct nl_context are accessed after the netlink context is freed by netlink_done(). Use local variables to store the two flags and check them instead.
--- netlink/netlink.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
netlink/netlink.c +7 -3
@@ -457,6 +457,7 @@ void netlink_run_handler(struct cmd_context *ctx, nl_func_t nlfunc, bool no_fallback) {bool wildcard = ctx->devname && !strcmp (ctx->devname,WILDCARD_DEVNAME ); +bool wildcard_unsupported, ioctl_fallback;struct nl_context *nlctx;const char *reason;int ret;
@@ -478,14 +479,17 @@ void netlink_run_handler(struct cmd_context *ctx, nl_func_t nlfunc, nlctx = ctx->nlctx; ret =nlfunc (ctx); + wildcard_unsupported = nlctx->wildcard_unsupported; + ioctl_fallback = nlctx->ioctl_fallback;netlink_done (ctx); -if (no_fallback || ret != -EOPNOTSUPP || !nlctx->ioctl_fallback) { -if (nlctx->wildcard_unsupported) + +if (no_fallback || ret != -EOPNOTSUPP || !ioctl_fallback) { +if (wildcard_unsupported)fprintf (stderr,"%s\n" ,"subcommand does not support wildcard dump" );exit (ret >=0 ? ret :1 ); } -if (nlctx->wildcard_unsupported) +if (wildcard_unsupported) reason ="subcommand does not support wildcard dump" ;else reason ="kernel netlink support for subcommand missing" ;
Signature · 1 line
2.29.2
PATCH 2/2 netlink: fix leaked instances of struct nl_socket
In reply to Michal KubecekValgrind detected memory leaks caused by missing cleanup of netlink context's ethnl_socket, ethnl2_socket and rtnl_socket. Also, contrary to its description, nlsock_done() does not free struct nl_socket itself. Fix nlsock_done() to free the structure and use it to dispose of sockets pointed to by struct nl_context members.
--- netlink/netlink.c | 11 ++++++++--- netlink/nlsock.c | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-)
netlink/netlink.c +8 -3
@@ -435,11 +435,16 @@ out_free:static void netlink_done (struct cmd_context *ctx) { -if (!ctx->nlctx) +struct nl_context *nlctx = ctx->nlctx; + +if (!nlctx)return ; -free (ctx->nlctx->ops_info); -free (ctx->nlctx); +nlsock_done (nlctx->ethnl_socket); +nlsock_done (nlctx->ethnl2_socket); +nlsock_done (nlctx->rtnl_socket); +free (nlctx->ops_info); +free (nlctx); ctx->nlctx =NULL ;cleanup_all_strings (); }
netlink/nlsock.c +3 -0
@@ -395,8 +395,11 @@ out_msgbuff:*/ void nlsock_done (struct nl_socket *nlsk) { +if (!nlsk) +return ;if (nlsk->sk)mnl_socket_close (nlsk->sk);msgbuff_done (&nlsk->msgbuff);memset (nlsk,'\0' ,sizeof (*nlsk)); +free (nlsk); }
Signature · 1 line
2.29.2