matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Amir Vadai 2017-05-14 11:17:44 +03:00 committed by Stephen Hemminger
parent 290cdc058d
commit cdca191862
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/man8/tc-pedit.8
View File

@ -266,7 +266,8 @@ Keep the addressed data as is.
.BI retain " RVAL" .BI retain " RVAL"
This optional extra part of This optional extra part of
.I CMD_SPEC .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 .TP
.I CONTROL .I CONTROL
The following keywords allow to control how the tree of qdisc, classes, The following keywords allow to control how the tree of qdisc, classes,

6
tc/m_pedit.c
View File

@ -353,6 +353,12 @@ int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type, __u32 retain,
argv++; argv++;
} }
if (len > 4 && retain != ~0) {
fprintf(stderr,
"retain is not supported for fields longer the 32 bits\n");
return -1;
}
if (type == TMAC) { if (type == TMAC) {
res = pack_mac(sel, tkey, (__u8 *)val); res = pack_mac(sel, tkey, (__u8 *)val);
goto done; goto done;