From: Sven Eckelmann <sven.eckelmann@openmesh.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven.eckelmann@openmesh.com>
Subject: [B.A.T.M.A.N.] [PATCH 04/10] batctl: Handle nlmsg_alloc errors
Date: Thu, 23 Nov 2017 15:04:38 +0100 [thread overview]
Message-ID: <20171123140444.17119-5-sven.eckelmann@openmesh.com> (raw)
In-Reply-To: <20171123140444.17119-1-sven.eckelmann@openmesh.com>
nlmsg_alloc may return NULL on errors. The processing has to be aborted
when this happens.
Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs")
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
---
netlink.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/netlink.c b/netlink.c
index 7fb1ee1..e3d7892 100644
--- a/netlink.c
+++ b/netlink.c
@@ -302,6 +302,11 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header)
return NULL;
msg = nlmsg_alloc();
+ if (!msg) {
+ nl_socket_free(sock);
+ return NULL;
+ }
+
genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, 0,
BATADV_CMD_GET_MESH_INFO, 1);
@@ -399,6 +404,11 @@ int netlink_print_routing_algos(void)
return -EOPNOTSUPP;
msg = nlmsg_alloc();
+ if (!msg) {
+ last_err = -ENOMEM;
+ goto err_free_sock;
+ }
+
genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP,
BATADV_CMD_GET_ROUTING_ALGOS, 1);
@@ -415,6 +425,8 @@ int netlink_print_routing_algos(void)
nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL);
nl_recvmsgs(sock, cb);
+
+err_free_sock:
nl_socket_free(sock);
if (!last_err)
@@ -1131,6 +1143,9 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface,
header);
msg = nlmsg_alloc();
+ if (!msg)
+ continue;
+
genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0,
NLM_F_DUMP, nl_cmd, 1);
--
2.11.0
next prev parent reply other threads:[~2017-11-23 14:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-23 14:04 [B.A.T.M.A.N.] [PATCH 00/10] batctl: Fixes and minor cleanup Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 01/10] batctl: Print dummy value when localtime failed Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 02/10] batctl: Handle failure during hash_iterator allocation Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 03/10] batctl: Handle allocation error for path_buff Sven Eckelmann
2017-11-23 14:04 ` Sven Eckelmann [this message]
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 05/10] batctl: Handle nl_socket_alloc errors Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 06/10] batctl: Handle nl_cb_alloc errors Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 07/10] batctl: Free nl_sock on genl_ctrl_resolve error Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 08/10] batctl: Free nl_sock when if_nametoindex failed Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 09/10] batctl: tcpdump: Fix types for for TT v1 Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 10/10] batctl: Simplify concatenation of pathnames Sven Eckelmann
2017-12-01 11:19 ` [B.A.T.M.A.N.] [PATCH 00/10] batctl: Fixes and minor cleanup Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171123140444.17119-5-sven.eckelmann@openmesh.com \
--to=sven.eckelmann@openmesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox