You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
1.7 KiB
58 lines
1.7 KiB
From 2bf855b076bbe5aa4665f7efd8bcaf882821cab5 Mon Sep 17 00:00:00 2001 |
|
From: Kamal Heib <kheib@redhat.com> |
|
Date: Thu, 9 Nov 2017 04:44:32 -0500 |
|
Subject: [PATCH] pedit: Do not allow using retain for too big fields |
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1456539 |
|
|
|
commit cdca191862775c47533908301760edd55763e861 |
|
Author: Amir Vadai <amir@vadai.me> |
|
Date: Sun May 14 11:17:44 2017 +0300 |
|
|
|
pedit: Do not allow using retain for too big fields |
|
|
|
Using retain for fields longer than 32 bits is not supported. |
|
Do not allow user to do it. |
|
|
|
Signed-off-by: Amir Vadai <amir@vadai.me> |
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com> |
|
--- |
|
man/man8/tc-pedit.8 | 3 ++- |
|
tc/m_pedit.c | 6 ++++++ |
|
2 files changed, 8 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8 |
|
index 7f482ea..9c4d57b 100644 |
|
--- a/man/man8/tc-pedit.8 |
|
+++ b/man/man8/tc-pedit.8 |
|
@@ -266,7 +266,8 @@ Keep the addressed data as is. |
|
.BI retain " RVAL" |
|
This optional extra part of |
|
.I CMD_SPEC |
|
-allows to exclude bits from being changed. |
|
+allows to exclude bits from being changed. Supported only for 32 bits fields |
|
+or smaller. |
|
.TP |
|
.I CONTROL |
|
The following keywords allow to control how the tree of qdisc, classes, |
|
diff --git a/tc/m_pedit.c b/tc/m_pedit.c |
|
index 7ef2acc..9b74c96 100644 |
|
--- a/tc/m_pedit.c |
|
+++ b/tc/m_pedit.c |
|
@@ -353,6 +353,12 @@ int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type, __u32 retain, |
|
argv++; |
|
} |
|
|
|
+ if (len > 4 && retain != ~0) { |
|
+ fprintf(stderr, |
|
+ "retain is not supported for fields longer the 32 bits\n"); |
|
+ return -1; |
|
+ } |
|
+ |
|
if (type == TMAC) { |
|
res = pack_mac(sel, tkey, (__u8 *)val); |
|
goto done; |
|
-- |
|
1.8.3.1 |
|
|
|
|