2019-05-27 14:55:01 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2014-11-06 03:51:51 +08:00
|
|
|
* net/sched/act_pedit.c Generic packet editor
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Authors: Jamal Hadi Salim (2002-4)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2007-03-26 14:06:12 +08:00
|
|
|
#include <net/netlink.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <net/pkt_sched.h>
|
|
|
|
#include <linux/tc_act/tc_pedit.h>
|
|
|
|
#include <net/tc_act/tc_pedit.h>
|
2017-02-07 15:56:07 +08:00
|
|
|
#include <uapi/linux/tc_act/tc_pedit.h>
|
2019-03-20 22:00:07 +08:00
|
|
|
#include <net/pkt_cls.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
netns: make struct pernet_operations::id unsigned int
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-17 09:58:21 +08:00
|
|
|
static unsigned int pedit_net_id;
|
2016-07-26 07:09:41 +08:00
|
|
|
static struct tc_action_ops act_pedit_ops;
|
2016-02-23 07:57:53 +08:00
|
|
|
|
2008-01-24 12:36:30 +08:00
|
|
|
static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {
|
2009-10-11 12:21:38 +08:00
|
|
|
[TCA_PEDIT_PARMS] = { .len = sizeof(struct tc_pedit) },
|
2017-02-07 15:56:07 +08:00
|
|
|
[TCA_PEDIT_KEYS_EX] = { .type = NLA_NESTED },
|
2008-01-24 12:36:30 +08:00
|
|
|
};
|
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
static const struct nla_policy pedit_key_ex_policy[TCA_PEDIT_KEY_EX_MAX + 1] = {
|
|
|
|
[TCA_PEDIT_KEY_EX_HTYPE] = { .type = NLA_U16 },
|
2017-02-07 15:56:08 +08:00
|
|
|
[TCA_PEDIT_KEY_EX_CMD] = { .type = NLA_U16 },
|
2017-02-07 15:56:07 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla,
|
|
|
|
u8 n)
|
|
|
|
{
|
|
|
|
struct tcf_pedit_key_ex *keys_ex;
|
|
|
|
struct tcf_pedit_key_ex *k;
|
|
|
|
const struct nlattr *ka;
|
|
|
|
int err = -EINVAL;
|
|
|
|
int rem;
|
|
|
|
|
2019-11-20 06:47:33 +08:00
|
|
|
if (!nla)
|
2017-02-07 15:56:07 +08:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
keys_ex = kcalloc(n, sizeof(*k), GFP_KERNEL);
|
|
|
|
if (!keys_ex)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
|
|
k = keys_ex;
|
|
|
|
|
|
|
|
nla_for_each_nested(ka, nla, rem) {
|
|
|
|
struct nlattr *tb[TCA_PEDIT_KEY_EX_MAX + 1];
|
|
|
|
|
|
|
|
if (!n) {
|
|
|
|
err = -EINVAL;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
n--;
|
|
|
|
|
|
|
|
if (nla_type(ka) != TCA_PEDIT_KEY_EX) {
|
|
|
|
err = -EINVAL;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
|
netlink: make validation more configurable for future strictness
We currently have two levels of strict validation:
1) liberal (default)
- undefined (type >= max) & NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
- garbage at end of message accepted
2) strict (opt-in)
- NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
Split out parsing strictness into four different options:
* TRAILING - check that there's no trailing data after parsing
attributes (in message or nested)
* MAXTYPE - reject attrs > max known type
* UNSPEC - reject attributes with NLA_UNSPEC policy entries
* STRICT_ATTRS - strictly validate attribute size
The default for future things should be *everything*.
The current *_strict() is a combination of TRAILING and MAXTYPE,
and is renamed to _deprecated_strict().
The current regular parsing has none of this, and is renamed to
*_parse_deprecated().
Additionally it allows us to selectively set one of the new flags
even on old policies. Notably, the UNSPEC flag could be useful in
this case, since it can be arranged (by filling in the policy) to
not be an incompatible userspace ABI change, but would then going
forward prevent forgetting attribute entries. Similar can apply
to the POLICY flag.
We end up with the following renames:
* nla_parse -> nla_parse_deprecated
* nla_parse_strict -> nla_parse_deprecated_strict
* nlmsg_parse -> nlmsg_parse_deprecated
* nlmsg_parse_strict -> nlmsg_parse_deprecated_strict
* nla_parse_nested -> nla_parse_nested_deprecated
* nla_validate_nested -> nla_validate_nested_deprecated
Using spatch, of course:
@@
expression TB, MAX, HEAD, LEN, POL, EXT;
@@
-nla_parse(TB, MAX, HEAD, LEN, POL, EXT)
+nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression TB, MAX, NLA, POL, EXT;
@@
-nla_parse_nested(TB, MAX, NLA, POL, EXT)
+nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT)
@@
expression START, MAX, POL, EXT;
@@
-nla_validate_nested(START, MAX, POL, EXT)
+nla_validate_nested_deprecated(START, MAX, POL, EXT)
@@
expression NLH, HDRLEN, MAX, POL, EXT;
@@
-nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT)
+nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT)
For this patch, don't actually add the strict, non-renamed versions
yet so that it breaks compile if I get it wrong.
Also, while at it, make nla_validate and nla_parse go down to a
common __nla_validate_parse() function to avoid code duplication.
Ultimately, this allows us to have very strict validation for every
new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the
next patch, while existing things will continue to work as is.
In effect then, this adds fully strict validation for any new command.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-26 20:07:28 +08:00
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_PEDIT_KEY_EX_MAX,
|
|
|
|
ka, pedit_key_ex_policy,
|
|
|
|
NULL);
|
2017-02-07 15:56:07 +08:00
|
|
|
if (err)
|
|
|
|
goto err_out;
|
|
|
|
|
2017-02-07 15:56:08 +08:00
|
|
|
if (!tb[TCA_PEDIT_KEY_EX_HTYPE] ||
|
|
|
|
!tb[TCA_PEDIT_KEY_EX_CMD]) {
|
2017-02-07 15:56:07 +08:00
|
|
|
err = -EINVAL;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
k->htype = nla_get_u16(tb[TCA_PEDIT_KEY_EX_HTYPE]);
|
2017-02-07 15:56:08 +08:00
|
|
|
k->cmd = nla_get_u16(tb[TCA_PEDIT_KEY_EX_CMD]);
|
2017-02-07 15:56:07 +08:00
|
|
|
|
2017-02-07 15:56:08 +08:00
|
|
|
if (k->htype > TCA_PEDIT_HDR_TYPE_MAX ||
|
|
|
|
k->cmd > TCA_PEDIT_CMD_MAX) {
|
2017-02-07 15:56:07 +08:00
|
|
|
err = -EINVAL;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
k++;
|
|
|
|
}
|
|
|
|
|
2017-06-14 18:29:31 +08:00
|
|
|
if (n) {
|
|
|
|
err = -EINVAL;
|
2017-02-07 15:56:07 +08:00
|
|
|
goto err_out;
|
2017-06-14 18:29:31 +08:00
|
|
|
}
|
2017-02-07 15:56:07 +08:00
|
|
|
|
|
|
|
return keys_ex;
|
|
|
|
|
|
|
|
err_out:
|
|
|
|
kfree(keys_ex);
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_pedit_key_ex_dump(struct sk_buff *skb,
|
|
|
|
struct tcf_pedit_key_ex *keys_ex, int n)
|
|
|
|
{
|
2019-04-26 17:13:06 +08:00
|
|
|
struct nlattr *keys_start = nla_nest_start_noflag(skb,
|
|
|
|
TCA_PEDIT_KEYS_EX);
|
2017-02-07 15:56:07 +08:00
|
|
|
|
2018-08-28 04:56:22 +08:00
|
|
|
if (!keys_start)
|
|
|
|
goto nla_failure;
|
2017-02-07 15:56:07 +08:00
|
|
|
for (; n > 0; n--) {
|
|
|
|
struct nlattr *key_start;
|
|
|
|
|
2019-04-26 17:13:06 +08:00
|
|
|
key_start = nla_nest_start_noflag(skb, TCA_PEDIT_KEY_EX);
|
2018-08-28 04:56:22 +08:00
|
|
|
if (!key_start)
|
|
|
|
goto nla_failure;
|
2017-02-07 15:56:07 +08:00
|
|
|
|
2017-02-07 15:56:08 +08:00
|
|
|
if (nla_put_u16(skb, TCA_PEDIT_KEY_EX_HTYPE, keys_ex->htype) ||
|
2018-08-28 04:56:22 +08:00
|
|
|
nla_put_u16(skb, TCA_PEDIT_KEY_EX_CMD, keys_ex->cmd))
|
|
|
|
goto nla_failure;
|
2017-02-07 15:56:07 +08:00
|
|
|
|
|
|
|
nla_nest_end(skb, key_start);
|
|
|
|
|
|
|
|
keys_ex++;
|
|
|
|
}
|
|
|
|
|
|
|
|
nla_nest_end(skb, keys_start);
|
|
|
|
|
|
|
|
return 0;
|
2018-08-28 04:56:22 +08:00
|
|
|
nla_failure:
|
|
|
|
nla_nest_cancel(skb, keys_start);
|
|
|
|
return -EINVAL;
|
2017-02-07 15:56:07 +08:00
|
|
|
}
|
|
|
|
|
2013-01-14 13:15:39 +08:00
|
|
|
static int tcf_pedit_init(struct net *net, struct nlattr *nla,
|
2016-07-26 07:09:41 +08:00
|
|
|
struct nlattr *est, struct tc_action **a,
|
2018-07-05 22:24:25 +08:00
|
|
|
int ovr, int bind, bool rtnl_held,
|
net/sched: prepare TC actions to properly validate the control action
- pass a pointer to struct tcf_proto in each actions's init() handler,
to allow validating the control action, checking whether the chain
exists and (eventually) refcounting it.
- remove code that validates the control action after a successful call
to the action's init() handler, and replace it with a test that forbids
addition of actions having 'goto_chain' and NULL goto_chain pointer at
the same time.
- add tcf_action_check_ctrlact(), that will validate the control action
and eventually allocate the action 'goto_chain' within the init()
handler.
- add tcf_action_set_ctrlact(), that will assign the control action and
swap the current 'goto_chain' pointer with the new given one.
This disallows 'goto_chain' on actions that don't initialize it properly
in their init() handler, i.e. calling tcf_action_check_ctrlact() after
successful IDR reservation and then calling tcf_action_set_ctrlact()
to assign 'goto_chain' and 'tcf_action' consistently.
By doing this, the kernel does not leak anymore refcounts when a valid
'goto chain' handle is replaced in TC actions, causing kmemleak splats
like the following one:
# tc chain add dev dd0 chain 42 ingress protocol ip flower \
> ip_proto tcp action drop
# tc chain add dev dd0 chain 43 ingress protocol ip flower \
> ip_proto udp action drop
# tc filter add dev dd0 ingress matchall \
> action gact goto chain 42 index 66
# tc filter replace dev dd0 ingress matchall \
> action gact goto chain 43 index 66
# echo scan >/sys/kernel/debug/kmemleak
<...>
unreferenced object 0xffff93c0ee09f000 (size 1024):
comm "tc", pid 2565, jiffies 4295339808 (age 65.426s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 08 00 06 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000009b63f92d>] tc_ctl_chain+0x3d2/0x4c0
[<00000000683a8d72>] rtnetlink_rcv_msg+0x263/0x2d0
[<00000000ddd88f8e>] netlink_rcv_skb+0x4a/0x110
[<000000006126a348>] netlink_unicast+0x1a0/0x250
[<00000000b3340877>] netlink_sendmsg+0x2c1/0x3c0
[<00000000a25a2171>] sock_sendmsg+0x36/0x40
[<00000000f19ee1ec>] ___sys_sendmsg+0x280/0x2f0
[<00000000d0422042>] __sys_sendmsg+0x5e/0xa0
[<000000007a6c61f9>] do_syscall_64+0x5b/0x180
[<00000000ccd07542>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[<0000000013eaa334>] 0xffffffffffffffff
Fixes: db50514f9a9c ("net: sched: add termination action to allow goto chain")
Fixes: 97763dc0f401 ("net_sched: reject unknown tcfa_action values")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-03-20 21:59:59 +08:00
|
|
|
struct tcf_proto *tp, struct netlink_ext_ack *extack)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2016-02-23 07:57:53 +08:00
|
|
|
struct tc_action_net *tn = net_generic(net, pedit_net_id);
|
2008-01-23 14:11:50 +08:00
|
|
|
struct nlattr *tb[TCA_PEDIT_MAX + 1];
|
2019-03-20 22:00:07 +08:00
|
|
|
struct tcf_chain *goto_ch = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_pedit_key *keys = NULL;
|
2017-02-07 15:56:07 +08:00
|
|
|
struct tcf_pedit_key_ex *keys_ex;
|
2018-06-28 01:33:30 +08:00
|
|
|
struct tc_pedit *parm;
|
|
|
|
struct nlattr *pattr;
|
|
|
|
struct tcf_pedit *p;
|
|
|
|
int ret = 0, err;
|
2024-06-12 13:13:20 +08:00
|
|
|
int i, ksize;
|
2019-08-01 21:02:51 +08:00
|
|
|
u32 index;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2018-07-02 12:02:02 +08:00
|
|
|
if (!nla) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Pedit requires attributes to be passed");
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
2018-07-02 12:02:02 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
netlink: make validation more configurable for future strictness
We currently have two levels of strict validation:
1) liberal (default)
- undefined (type >= max) & NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
- garbage at end of message accepted
2) strict (opt-in)
- NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
Split out parsing strictness into four different options:
* TRAILING - check that there's no trailing data after parsing
attributes (in message or nested)
* MAXTYPE - reject attrs > max known type
* UNSPEC - reject attributes with NLA_UNSPEC policy entries
* STRICT_ATTRS - strictly validate attribute size
The default for future things should be *everything*.
The current *_strict() is a combination of TRAILING and MAXTYPE,
and is renamed to _deprecated_strict().
The current regular parsing has none of this, and is renamed to
*_parse_deprecated().
Additionally it allows us to selectively set one of the new flags
even on old policies. Notably, the UNSPEC flag could be useful in
this case, since it can be arranged (by filling in the policy) to
not be an incompatible userspace ABI change, but would then going
forward prevent forgetting attribute entries. Similar can apply
to the POLICY flag.
We end up with the following renames:
* nla_parse -> nla_parse_deprecated
* nla_parse_strict -> nla_parse_deprecated_strict
* nlmsg_parse -> nlmsg_parse_deprecated
* nlmsg_parse_strict -> nlmsg_parse_deprecated_strict
* nla_parse_nested -> nla_parse_nested_deprecated
* nla_validate_nested -> nla_validate_nested_deprecated
Using spatch, of course:
@@
expression TB, MAX, HEAD, LEN, POL, EXT;
@@
-nla_parse(TB, MAX, HEAD, LEN, POL, EXT)
+nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression TB, MAX, NLA, POL, EXT;
@@
-nla_parse_nested(TB, MAX, NLA, POL, EXT)
+nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT)
@@
expression START, MAX, POL, EXT;
@@
-nla_validate_nested(START, MAX, POL, EXT)
+nla_validate_nested_deprecated(START, MAX, POL, EXT)
@@
expression NLH, HDRLEN, MAX, POL, EXT;
@@
-nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT)
+nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT)
For this patch, don't actually add the strict, non-renamed versions
yet so that it breaks compile if I get it wrong.
Also, while at it, make nla_validate and nla_parse go down to a
common __nla_validate_parse() function to avoid code duplication.
Ultimately, this allows us to have very strict validation for every
new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the
next patch, while existing things will continue to work as is.
In effect then, this adds fully strict validation for any new command.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-26 20:07:28 +08:00
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_PEDIT_MAX, nla,
|
|
|
|
pedit_policy, NULL);
|
2008-01-24 12:33:32 +08:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
pattr = tb[TCA_PEDIT_PARMS];
|
|
|
|
if (!pattr)
|
|
|
|
pattr = tb[TCA_PEDIT_PARMS_EX];
|
2018-07-02 12:02:02 +08:00
|
|
|
if (!pattr) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Missing required TCA_PEDIT_PARMS or TCA_PEDIT_PARMS_EX pedit attribute");
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
2018-07-02 12:02:02 +08:00
|
|
|
}
|
2017-02-07 15:56:07 +08:00
|
|
|
|
|
|
|
parm = nla_data(pattr);
|
2019-11-20 06:47:33 +08:00
|
|
|
if (!parm->nkeys) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Pedit requires keys to be passed");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
ksize = parm->nkeys * sizeof(struct tc_pedit_key);
|
2018-07-02 12:02:02 +08:00
|
|
|
if (nla_len(pattr) < sizeof(*parm) + ksize) {
|
|
|
|
NL_SET_ERR_MSG_ATTR(extack, pattr, "Length of TCA_PEDIT_PARMS or TCA_PEDIT_PARMS_EX pedit attribute is invalid");
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
2018-07-02 12:02:02 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
keys_ex = tcf_pedit_keys_ex_parse(tb[TCA_PEDIT_KEYS_EX], parm->nkeys);
|
|
|
|
if (IS_ERR(keys_ex))
|
|
|
|
return PTR_ERR(keys_ex);
|
|
|
|
|
2019-08-01 21:02:51 +08:00
|
|
|
index = parm->index;
|
|
|
|
err = tcf_idr_check_alloc(tn, &index, a, bind);
|
2018-07-05 22:24:32 +08:00
|
|
|
if (!err) {
|
2019-08-01 21:02:51 +08:00
|
|
|
ret = tcf_idr_create(tn, index, est, a,
|
2017-08-30 14:31:59 +08:00
|
|
|
&act_pedit_ops, bind, false);
|
2018-07-05 22:24:32 +08:00
|
|
|
if (ret) {
|
2019-08-01 21:02:51 +08:00
|
|
|
tcf_idr_cleanup(tn, index);
|
2018-07-03 21:45:12 +08:00
|
|
|
goto out_free;
|
2018-07-05 22:24:32 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
ret = ACT_P_CREATED;
|
2018-07-05 22:24:32 +08:00
|
|
|
} else if (err > 0) {
|
2013-12-23 21:02:11 +08:00
|
|
|
if (bind)
|
2018-07-03 21:45:12 +08:00
|
|
|
goto out_free;
|
|
|
|
if (!ovr) {
|
|
|
|
ret = -EEXIST;
|
2018-08-11 01:51:46 +08:00
|
|
|
goto out_release;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2018-07-05 22:24:32 +08:00
|
|
|
} else {
|
2018-11-14 19:17:25 +08:00
|
|
|
ret = err;
|
|
|
|
goto out_free;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2019-03-20 22:00:07 +08:00
|
|
|
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
|
|
|
|
if (err < 0) {
|
|
|
|
ret = err;
|
|
|
|
goto out_release;
|
|
|
|
}
|
2018-08-11 01:51:46 +08:00
|
|
|
p = to_pedit(*a);
|
2006-08-22 14:54:55 +08:00
|
|
|
spin_lock_bh(&p->tcf_lock);
|
2018-08-11 01:51:46 +08:00
|
|
|
|
|
|
|
if (ret == ACT_P_CREATED ||
|
|
|
|
(p->tcfp_nkeys && p->tcfp_nkeys != parm->nkeys)) {
|
|
|
|
keys = kmalloc(ksize, GFP_ATOMIC);
|
|
|
|
if (!keys) {
|
|
|
|
spin_unlock_bh(&p->tcf_lock);
|
|
|
|
ret = -ENOMEM;
|
2019-03-20 22:00:07 +08:00
|
|
|
goto put_chain;
|
2018-08-11 01:51:46 +08:00
|
|
|
}
|
2006-08-22 14:54:55 +08:00
|
|
|
kfree(p->tcfp_keys);
|
|
|
|
p->tcfp_keys = keys;
|
|
|
|
p->tcfp_nkeys = parm->nkeys;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-22 14:54:55 +08:00
|
|
|
memcpy(p->tcfp_keys, parm->keys, ksize);
|
2024-06-12 13:13:20 +08:00
|
|
|
p->tcfp_off_max_hint = 0;
|
|
|
|
for (i = 0; i < p->tcfp_nkeys; ++i) {
|
|
|
|
u32 cur = p->tcfp_keys[i].off;
|
|
|
|
|
|
|
|
/* sanitize the shift value for any later use */
|
|
|
|
p->tcfp_keys[i].shift = min_t(size_t, BITS_PER_TYPE(int) - 1,
|
|
|
|
p->tcfp_keys[i].shift);
|
|
|
|
|
|
|
|
/* The AT option can read a single byte, we can bound the actual
|
|
|
|
* value with uchar max.
|
|
|
|
*/
|
|
|
|
cur += (0xff & p->tcfp_keys[i].offmask) >> p->tcfp_keys[i].shift;
|
|
|
|
|
|
|
|
/* Each key touches 4 bytes starting from the computed offset */
|
|
|
|
p->tcfp_off_max_hint = max(p->tcfp_off_max_hint, cur + 4);
|
|
|
|
}
|
2017-02-07 15:56:07 +08:00
|
|
|
|
2018-08-11 01:51:46 +08:00
|
|
|
p->tcfp_flags = parm->flags;
|
2019-03-20 22:00:07 +08:00
|
|
|
goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
|
2018-08-11 01:51:46 +08:00
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
kfree(p->tcfp_keys_ex);
|
|
|
|
p->tcfp_keys_ex = keys_ex;
|
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
spin_unlock_bh(&p->tcf_lock);
|
2019-03-20 22:00:07 +08:00
|
|
|
if (goto_ch)
|
|
|
|
tcf_chain_put_by_act(goto_ch);
|
2005-04-17 06:20:36 +08:00
|
|
|
return ret;
|
2018-08-11 01:51:46 +08:00
|
|
|
|
2019-03-20 22:00:07 +08:00
|
|
|
put_chain:
|
|
|
|
if (goto_ch)
|
|
|
|
tcf_chain_put_by_act(goto_ch);
|
2018-08-11 01:51:46 +08:00
|
|
|
out_release:
|
|
|
|
tcf_idr_release(*a, bind);
|
2018-07-03 21:45:12 +08:00
|
|
|
out_free:
|
|
|
|
kfree(keys_ex);
|
|
|
|
return ret;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-12-06 04:53:07 +08:00
|
|
|
static void tcf_pedit_cleanup(struct tc_action *a)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2016-07-26 07:09:41 +08:00
|
|
|
struct tcf_pedit *p = to_pedit(a);
|
2014-02-12 09:07:32 +08:00
|
|
|
struct tc_pedit_key *keys = p->tcfp_keys;
|
2018-06-28 01:33:30 +08:00
|
|
|
|
2014-02-12 09:07:32 +08:00
|
|
|
kfree(keys);
|
2017-02-07 15:56:07 +08:00
|
|
|
kfree(p->tcfp_keys_ex);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2016-11-28 18:56:40 +08:00
|
|
|
static bool offset_valid(struct sk_buff *skb, int offset)
|
|
|
|
{
|
|
|
|
if (offset > 0 && offset > skb->len)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (offset < 0 && -offset > skb_headroom(skb))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
static int pedit_skb_hdr_offset(struct sk_buff *skb,
|
|
|
|
enum pedit_header_type htype, int *hoffset)
|
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
switch (htype) {
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH:
|
|
|
|
if (skb_mac_header_was_set(skb)) {
|
|
|
|
*hoffset = skb_mac_offset(skb);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK:
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4:
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6:
|
|
|
|
*hoffset = skb_network_offset(skb);
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP:
|
|
|
|
case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP:
|
|
|
|
if (skb_transport_header_was_set(skb)) {
|
|
|
|
*hoffset = skb_transport_offset(skb);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EINVAL;
|
|
|
|
break;
|
2018-07-28 18:29:01 +08:00
|
|
|
}
|
2017-02-07 15:56:07 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-08-12 21:34:55 +08:00
|
|
|
static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,
|
|
|
|
struct tcf_result *res)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2016-07-26 07:09:41 +08:00
|
|
|
struct tcf_pedit *p = to_pedit(a);
|
2024-06-12 13:13:20 +08:00
|
|
|
u32 max_offset;
|
2015-04-30 18:12:00 +08:00
|
|
|
int i;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
spin_lock(&p->tcf_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2024-06-12 13:13:20 +08:00
|
|
|
max_offset = (skb_transport_header_was_set(skb) ?
|
|
|
|
skb_transport_offset(skb) :
|
|
|
|
skb_network_offset(skb)) +
|
|
|
|
p->tcfp_off_max_hint;
|
|
|
|
if (skb_ensure_writable(skb, min(skb->len, max_offset)))
|
|
|
|
goto unlock;
|
|
|
|
|
2016-06-06 18:32:53 +08:00
|
|
|
tcf_lastuse_update(&p->tcf_tm);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
if (p->tcfp_nkeys > 0) {
|
|
|
|
struct tc_pedit_key *tkey = p->tcfp_keys;
|
2017-02-07 15:56:07 +08:00
|
|
|
struct tcf_pedit_key_ex *tkey_ex = p->tcfp_keys_ex;
|
2018-06-28 01:33:30 +08:00
|
|
|
enum pedit_header_type htype =
|
|
|
|
TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
|
2017-02-07 15:56:08 +08:00
|
|
|
enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
for (i = p->tcfp_nkeys; i > 0; i--, tkey++) {
|
2018-06-28 01:33:32 +08:00
|
|
|
u32 *ptr, hdata;
|
2005-04-17 06:20:36 +08:00
|
|
|
int offset = tkey->off;
|
2017-02-07 15:56:07 +08:00
|
|
|
int hoffset;
|
2017-02-07 15:56:08 +08:00
|
|
|
u32 val;
|
2017-02-07 15:56:07 +08:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
if (tkey_ex) {
|
|
|
|
htype = tkey_ex->htype;
|
2017-02-07 15:56:08 +08:00
|
|
|
cmd = tkey_ex->cmd;
|
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
tkey_ex++;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = pedit_skb_hdr_offset(skb, htype, &hoffset);
|
|
|
|
if (rc) {
|
2018-06-28 01:33:34 +08:00
|
|
|
pr_info("tc action pedit bad header type specified (0x%x)\n",
|
2017-02-07 15:56:07 +08:00
|
|
|
htype);
|
|
|
|
goto bad;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (tkey->offmask) {
|
2018-06-28 01:33:35 +08:00
|
|
|
u8 *d, _d;
|
2010-06-02 12:55:02 +08:00
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
if (!offset_valid(skb, hoffset + tkey->at)) {
|
2018-06-28 01:33:34 +08:00
|
|
|
pr_info("tc action pedit 'at' offset %d out of bounds\n",
|
2017-02-07 15:56:07 +08:00
|
|
|
hoffset + tkey->at);
|
2016-11-28 18:56:40 +08:00
|
|
|
goto bad;
|
|
|
|
}
|
2018-06-28 01:33:30 +08:00
|
|
|
d = skb_header_pointer(skb, hoffset + tkey->at,
|
2018-06-28 01:33:33 +08:00
|
|
|
sizeof(_d), &_d);
|
2010-06-02 12:55:02 +08:00
|
|
|
if (!d)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto bad;
|
2010-06-02 12:55:02 +08:00
|
|
|
offset += (*d & tkey->offmask) >> tkey->shift;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (offset % 4) {
|
2018-06-28 01:33:34 +08:00
|
|
|
pr_info("tc action pedit offset must be on 32 bit boundaries\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
goto bad;
|
|
|
|
}
|
2016-11-28 18:56:40 +08:00
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
if (!offset_valid(skb, hoffset + offset)) {
|
2018-06-28 01:33:34 +08:00
|
|
|
pr_info("tc action pedit offset %d out of bounds\n",
|
2017-02-07 15:56:07 +08:00
|
|
|
hoffset + offset);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
2018-06-28 01:33:30 +08:00
|
|
|
ptr = skb_header_pointer(skb, hoffset + offset,
|
2018-06-28 01:33:33 +08:00
|
|
|
sizeof(hdata), &hdata);
|
2010-06-02 12:55:02 +08:00
|
|
|
if (!ptr)
|
|
|
|
goto bad;
|
2005-04-17 06:20:36 +08:00
|
|
|
/* just do it, baby */
|
2017-02-07 15:56:08 +08:00
|
|
|
switch (cmd) {
|
|
|
|
case TCA_PEDIT_KEY_EX_CMD_SET:
|
|
|
|
val = tkey->val;
|
|
|
|
break;
|
|
|
|
case TCA_PEDIT_KEY_EX_CMD_ADD:
|
|
|
|
val = (*ptr + tkey->val) & ~tkey->mask;
|
|
|
|
break;
|
|
|
|
default:
|
2018-06-28 01:33:34 +08:00
|
|
|
pr_info("tc action pedit bad command (%d)\n",
|
2017-02-07 15:56:08 +08:00
|
|
|
cmd);
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ptr = ((*ptr & tkey->mask) ^ val);
|
2018-06-28 01:33:32 +08:00
|
|
|
if (ptr == &hdata)
|
2017-02-07 15:56:07 +08:00
|
|
|
skb_store_bits(skb, hoffset + offset, ptr, 4);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2007-02-09 22:25:16 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
goto done;
|
2018-06-28 01:33:30 +08:00
|
|
|
} else {
|
2010-05-12 14:37:05 +08:00
|
|
|
WARN(1, "pedit BUG: index %d\n", p->tcf_index);
|
2018-06-28 01:33:30 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
bad:
|
2006-08-22 14:54:55 +08:00
|
|
|
p->tcf_qstats.overlimits++;
|
2005-04-17 06:20:36 +08:00
|
|
|
done:
|
2011-01-09 16:30:54 +08:00
|
|
|
bstats_update(&p->tcf_bstats, skb);
|
2024-06-12 13:13:20 +08:00
|
|
|
unlock:
|
2006-08-22 14:54:55 +08:00
|
|
|
spin_unlock(&p->tcf_lock);
|
|
|
|
return p->tcf_action;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,
|
|
|
|
int bind, int ref)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-04-20 11:29:13 +08:00
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2016-07-26 07:09:41 +08:00
|
|
|
struct tcf_pedit *p = to_pedit(a);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_pedit *opt;
|
|
|
|
struct tcf_t t;
|
2007-02-09 22:25:16 +08:00
|
|
|
int s;
|
|
|
|
|
2019-02-08 09:02:52 +08:00
|
|
|
s = struct_size(opt, keys, p->tcfp_nkeys);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* netlink spinlocks held above us - must use ATOMIC */
|
2006-07-22 05:51:30 +08:00
|
|
|
opt = kzalloc(s, GFP_ATOMIC);
|
2006-08-22 14:54:55 +08:00
|
|
|
if (unlikely(!opt))
|
2005-04-17 06:20:36 +08:00
|
|
|
return -ENOBUFS;
|
|
|
|
|
2018-08-11 01:51:46 +08:00
|
|
|
spin_lock_bh(&p->tcf_lock);
|
2006-08-22 14:54:55 +08:00
|
|
|
memcpy(opt->keys, p->tcfp_keys,
|
|
|
|
p->tcfp_nkeys * sizeof(struct tc_pedit_key));
|
|
|
|
opt->index = p->tcf_index;
|
|
|
|
opt->nkeys = p->tcfp_nkeys;
|
|
|
|
opt->flags = p->tcfp_flags;
|
|
|
|
opt->action = p->tcf_action;
|
2018-07-05 22:24:24 +08:00
|
|
|
opt->refcnt = refcount_read(&p->tcf_refcnt) - ref;
|
|
|
|
opt->bindcnt = atomic_read(&p->tcf_bindcnt) - bind;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-02-07 15:56:07 +08:00
|
|
|
if (p->tcfp_keys_ex) {
|
2018-08-28 04:56:22 +08:00
|
|
|
if (tcf_pedit_key_ex_dump(skb,
|
|
|
|
p->tcfp_keys_ex,
|
|
|
|
p->tcfp_nkeys))
|
|
|
|
goto nla_put_failure;
|
2017-02-07 15:56:07 +08:00
|
|
|
|
|
|
|
if (nla_put(skb, TCA_PEDIT_PARMS_EX, s, opt))
|
|
|
|
goto nla_put_failure;
|
|
|
|
} else {
|
|
|
|
if (nla_put(skb, TCA_PEDIT_PARMS, s, opt))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
2016-06-06 18:32:55 +08:00
|
|
|
|
|
|
|
tcf_tm_dump(&t, &p->tcf_tm);
|
2016-04-26 16:06:18 +08:00
|
|
|
if (nla_put_64bit(skb, TCA_PEDIT_TM, sizeof(t), &t, TCA_PEDIT_PAD))
|
2012-03-29 17:11:39 +08:00
|
|
|
goto nla_put_failure;
|
2018-08-11 01:51:46 +08:00
|
|
|
spin_unlock_bh(&p->tcf_lock);
|
2016-06-06 18:32:55 +08:00
|
|
|
|
2006-01-09 14:17:27 +08:00
|
|
|
kfree(opt);
|
2005-04-17 06:20:36 +08:00
|
|
|
return skb->len;
|
|
|
|
|
2008-01-23 14:11:50 +08:00
|
|
|
nla_put_failure:
|
2018-08-11 01:51:46 +08:00
|
|
|
spin_unlock_bh(&p->tcf_lock);
|
2007-03-26 14:06:12 +08:00
|
|
|
nlmsg_trim(skb, b);
|
2006-01-09 14:17:27 +08:00
|
|
|
kfree(opt);
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-02-23 07:57:53 +08:00
|
|
|
static int tcf_pedit_walker(struct net *net, struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb, int type,
|
2018-02-15 23:54:58 +08:00
|
|
|
const struct tc_action_ops *ops,
|
|
|
|
struct netlink_ext_ack *extack)
|
2016-02-23 07:57:53 +08:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, pedit_net_id);
|
|
|
|
|
2018-02-15 23:54:59 +08:00
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
2016-02-23 07:57:53 +08:00
|
|
|
}
|
|
|
|
|
2018-08-30 01:15:35 +08:00
|
|
|
static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index)
|
2016-02-23 07:57:53 +08:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, pedit_net_id);
|
|
|
|
|
2017-08-30 14:31:59 +08:00
|
|
|
return tcf_idr_search(tn, a, index);
|
2016-02-23 07:57:53 +08:00
|
|
|
}
|
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
static struct tc_action_ops act_pedit_ops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.kind = "pedit",
|
2019-02-10 20:25:00 +08:00
|
|
|
.id = TCA_ID_PEDIT,
|
2005-04-17 06:20:36 +08:00
|
|
|
.owner = THIS_MODULE,
|
2018-08-12 21:34:55 +08:00
|
|
|
.act = tcf_pedit_act,
|
2005-04-17 06:20:36 +08:00
|
|
|
.dump = tcf_pedit_dump,
|
|
|
|
.cleanup = tcf_pedit_cleanup,
|
|
|
|
.init = tcf_pedit_init,
|
2016-02-23 07:57:53 +08:00
|
|
|
.walk = tcf_pedit_walker,
|
|
|
|
.lookup = tcf_pedit_search,
|
2016-07-26 07:09:41 +08:00
|
|
|
.size = sizeof(struct tcf_pedit),
|
2016-02-23 07:57:53 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static __net_init int pedit_init_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, pedit_net_id);
|
|
|
|
|
2019-08-26 01:01:32 +08:00
|
|
|
return tc_action_net_init(net, tn, &act_pedit_ops);
|
2016-02-23 07:57:53 +08:00
|
|
|
}
|
|
|
|
|
2017-12-12 07:35:03 +08:00
|
|
|
static void __net_exit pedit_exit_net(struct list_head *net_list)
|
2016-02-23 07:57:53 +08:00
|
|
|
{
|
2017-12-12 07:35:03 +08:00
|
|
|
tc_action_net_exit(net_list, pedit_net_id);
|
2016-02-23 07:57:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations pedit_net_ops = {
|
|
|
|
.init = pedit_init_net,
|
2017-12-12 07:35:03 +08:00
|
|
|
.exit_batch = pedit_exit_net,
|
2016-02-23 07:57:53 +08:00
|
|
|
.id = &pedit_net_id,
|
|
|
|
.size = sizeof(struct tc_action_net),
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Jamal Hadi Salim(2002-4)");
|
|
|
|
MODULE_DESCRIPTION("Generic Packet Editor actions");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
static int __init pedit_init_module(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2016-02-23 07:57:53 +08:00
|
|
|
return tcf_register_action(&act_pedit_ops, &pedit_net_ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-08-22 14:54:55 +08:00
|
|
|
static void __exit pedit_cleanup_module(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2016-02-23 07:57:53 +08:00
|
|
|
tcf_unregister_action(&act_pedit_ops, &pedit_net_ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(pedit_init_module);
|
|
|
|
module_exit(pedit_cleanup_module);
|