From 7a105c2191a00f077539b4948453d032b9018097 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 27 Dec 2018 14:27:51 +0100 Subject: [PATCH] netlink: don't require a callback argument in nl_recvmsgs() --- src/platform/nm-netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/nm-netlink.c b/src/platform/nm-netlink.c index 72f7c73495..6abc1c3a34 100644 --- a/src/platform/nm-netlink.c +++ b/src/platform/nm-netlink.c @@ -1055,7 +1055,7 @@ nl_wait_for_ack (struct nl_sock *sk, do { \ const struct nl_cb *_cb = (cb); \ \ - if (_cb->type##_cb) { \ + if (_cb && _cb->type##_cb) { \ /* the returned value here must be either a negative * netlink error number, or one of NL_SKIP, NL_STOP, NL_OK. */ \ nmerr = _cb->type##_cb ((msg), _cb->type##_arg); \ @@ -1171,7 +1171,7 @@ continue_reading: } if (e->error) { /* Error message reported back from kernel. */ - if (cb->err_cb) { + if (cb && cb->err_cb) { /* the returned value here must be either a negative * netlink error number, or one of NL_SKIP, NL_STOP, NL_OK. */ nmerr = cb->err_cb (&nla, e,