From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 10 Oct 2019 08:27:40 +0000 (+0200)
Subject: rtnl_rule: decode fib_rule_uid_range without use of <linux/fib_rules.h>
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bade0cb3cbe109026faeff913ebe4272553d316c;p=strace

rtnl_rule: decode fib_rule_uid_range without use of <linux/fib_rules.h>

* rtnl_rule.c (decode_fib_rule_uid_range): Define struct type for
fib_rule_uid_range explicitly.
(decode_fib_rule_uid_range) [!HAVE_STRUCT_FIB_RULE_UID_RANGE]: Remove.
* xlat/fib_rule_flags.in: Add fallback definitions.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
---

diff --git a/rtnl_rule.c b/rtnl_rule.c
index 7c628dbd..50971524 100644
--- a/rtnl_rule.c
+++ b/rtnl_rule.c
@@ -42,8 +42,10 @@ decode_fib_rule_uid_range(struct tcb *const tcp,
 			  const unsigned int len,
 			  const void *const opaque_data)
 {
-#ifdef HAVE_STRUCT_FIB_RULE_UID_RANGE
-	struct fib_rule_uid_range range;
+	struct /* fib_rule_uid_range */ {
+		uint32_t start;
+		uint32_t end;
+	} range;
 
 	if (len < sizeof(range))
 		return false;
@@ -54,9 +56,6 @@ decode_fib_rule_uid_range(struct tcb *const tcp,
 	}
 
 	return true;
-#else
-	return false;
-#endif
 }
 
 static bool
diff --git a/xlat/fib_rule_flags.in b/xlat/fib_rule_flags.in
index 8f4d42c0..001db9a3 100644
--- a/xlat/fib_rule_flags.in
+++ b/xlat/fib_rule_flags.in
@@ -1,6 +1,6 @@
-FIB_RULE_PERMANENT
-FIB_RULE_INVERT
-FIB_RULE_UNRESOLVED
-FIB_RULE_IIF_DETACHED
-FIB_RULE_OIF_DETACHED
-FIB_RULE_FIND_SADDR
+FIB_RULE_PERMANENT	0x00000001
+FIB_RULE_INVERT		0x00000002
+FIB_RULE_UNRESOLVED	0x00000004
+FIB_RULE_IIF_DETACHED	0x00000008
+FIB_RULE_OIF_DETACHED	0x00000010
+FIB_RULE_FIND_SADDR	0x00010000