Revert "dnsmasq: improve insecure DS warning"
[openwrt/staging/dedeckeh.git] / package / network / services / dnsmasq / patches / 0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch
1 From 7673013d2323834b555052ddbd87381bb5cd7bac Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Thu, 28 Mar 2019 22:04:10 +0000
4 Subject: [PATCH 49/57] Apply fix from c6cc455dd191fbea56ee14a0ef88a7d655a6fe9a
5 in DHCP code.
6
7 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
8 ---
9 src/dhcp.c | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12 --- a/src/dhcp.c
13 +++ b/src/dhcp.c
14 @@ -401,7 +401,8 @@ void dhcp_packet(time_t now, int pxe_fd)
15 pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
16 pkt->ipi_ifindex = rcvd_iface_index;
17 pkt->ipi_spec_dst.s_addr = 0;
18 - msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
19 + msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo));
20 + cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
21 cmptr->cmsg_level = IPPROTO_IP;
22 cmptr->cmsg_type = IP_PKTINFO;
23