[PATCH iproute2] xfrm: enable to set non-wildcard mark 0 on SAs and SPs
From: Christophe Gouault <hidden>
Date: 2013-10-08 13:04:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
ip xfrm considers that the user-defined mark is "any" as soon as (mark.v & mark.m == 0), which prevents from specifying non-wildcard marks that include the value 0 (typically 0/0xffffffff). Yet, matching exactly mark 0 is useful for instance to separate vti policies from global policies. Always configure the user mark if mark.m != 0. Signed-off-by: Christophe Gouault <redacted> --- ip/xfrm_policy.c | 2 +- ip/xfrm_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index 36e33c9..a8d8b98 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c@@ -373,7 +373,7 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) (void *)tmpls_buf, tmpls_len); } - if (mark.m & mark.v) { + if (mark.m) { int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, (void *)&mark, sizeof(mark)); if (r < 0) {
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index f4ad4cb..c4d2bf6 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c@@ -528,7 +528,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv) exit(1); } - if (mark.m & mark.v) { + if (mark.m) { int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK, (void *)&mark, sizeof(mark)); if (r < 0) {
--
1.7.10.4