|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
From ffee10553f786e69787f9813dae5b0395040b443 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
From: Patrik Flykt <patrik.flykt@linux.intel.com>
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
Date: Fri, 20 Oct 2017 11:59:15 +0300
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
Subject: [PATCH] sd-radv: Allocate space also for DNSSL iov option (#7144)
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
The iov array needs to hold five entries in addition to the number
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
of prefixes.
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
(cherry picked from commit 6852c0f6b0f7a4ac666e1d174f366d003d31edb3)
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
src/libsystemd-network/sd-radv.c | 5 +++--
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
index a3aa5c9c62..e4d12977cd 100644
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
--- a/src/libsystemd-network/sd-radv.c
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
+++ b/src/libsystemd-network/sd-radv.c
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
@@ -160,8 +160,9 @@ static int radv_send(sd_radv *ra, const struct in6_addr *dst,
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
.nd_opt_mtu_type = ND_OPT_MTU,
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
.nd_opt_mtu_len = 1,
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
};
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
- /* Reserve iov space for RA header, linkaddr, MTU, N prefixes, RDNSS */
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
- struct iovec iov[4 + ra->n_prefixes];
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
+ /* Reserve iov space for RA header, linkaddr, MTU, N prefixes, RDNSS
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
+ and DNSSL */
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
+ struct iovec iov[5 + ra->n_prefixes];
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
struct msghdr msg = {
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
.msg_name = &dst_addr,
|
|
Zbigniew Jędrzejewski-Szmek |
35bb94 |
.msg_namelen = sizeof(dst_addr),
|