101-0002-Reinstate-initialisation-of-msghdr-fields.patch (1230B)
1 From eaabcc1b09cccff2f8815d03da4d5778ab6bbd17 Mon Sep 17 00:00:00 2001 2 From: Quentin Armitage <quentin@armitage.org.uk> 3 Date: Mon, 16 May 2016 23:09:13 +0100 4 Subject: [PATCH] Reinstate initialisation of msghdr fields 5 6 Commit dbb2cac removed initialisation of the struct msghdr msg_control, 7 msg_controllen and msg_flags fields. This commit reinstates initialisation 8 of those fields. 9 10 Signed-off-by: Quentin Armitage <quentin@armitage.org.uk> 11 --- 12 keepalived/vrrp/vrrp_netlink.c | 6 ++++++ 13 1 file changed, 6 insertions(+) 14 15 diff --git a/keepalived/vrrp/vrrp_netlink.c b/keepalived/vrrp/vrrp_netlink.c 16 index 2c2fd59..62c37d6 100644 17 --- a/keepalived/vrrp/vrrp_netlink.c 18 +++ b/keepalived/vrrp/vrrp_netlink.c 19 @@ -421,6 +421,9 @@ netlink_parse_info(int (*filter) (struct sockaddr_nl *, struct nlmsghdr *), 20 .msg_namelen = sizeof(snl), 21 .msg_iov = &iov, 22 .msg_iovlen = 1, 23 + .msg_control = NULL, 24 + .msg_controllen = 0, 25 + .msg_flags = 0 26 }; 27 struct nlmsghdr *h; 28 29 @@ -547,6 +550,9 @@ netlink_talk(nl_handle_t *nl, struct nlmsghdr *n) 30 .msg_namelen = sizeof(snl), 31 .msg_iov = &iov, 32 .msg_iovlen = 1, 33 + .msg_control = NULL, 34 + .msg_controllen = 0, 35 + .msg_flags = 0 36 }; 37 38 memset(&snl, 0, sizeof snl); 39 -- 40 2.10.2 41