2019-05-19 16:51:43 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2006-08-04 03:48:59 +04:00
|
|
|
/*
|
|
|
|
* NetLabel CIPSO/IPv4 Support
|
|
|
|
*
|
|
|
|
* This file defines the CIPSO/IPv4 functions for the NetLabel system. The
|
|
|
|
* NetLabel system manages static and dynamic label mappings for network
|
|
|
|
* protocols such as CIPSO and RIPSO.
|
|
|
|
*
|
2011-08-01 15:10:33 +04:00
|
|
|
* Author: Paul Moore <paul@paul-moore.com>
|
2006-08-04 03:48:59 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* (c) Copyright Hewlett-Packard Development Company, L.P., 2006
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/socket.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/skbuff.h>
|
2006-09-29 01:51:47 +04:00
|
|
|
#include <linux/audit.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 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2006-08-04 03:48:59 +04:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/netlink.h>
|
|
|
|
#include <net/genetlink.h>
|
|
|
|
#include <net/netlabel.h>
|
|
|
|
#include <net/cipso_ipv4.h>
|
2011-07-27 03:09:06 +04:00
|
|
|
#include <linux/atomic.h>
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
#include "netlabel_user.h"
|
|
|
|
#include "netlabel_cipso_v4.h"
|
2007-07-18 20:28:45 +04:00
|
|
|
#include "netlabel_mgmt.h"
|
2008-10-10 18:16:31 +04:00
|
|
|
#include "netlabel_domainhash.h"
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
/* Argument struct for cipso_v4_doi_walk() */
|
|
|
|
struct netlbl_cipsov4_doiwalk_arg {
|
|
|
|
struct netlink_callback *nl_cb;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
u32 seq;
|
|
|
|
};
|
|
|
|
|
2008-10-10 18:16:31 +04:00
|
|
|
/* Argument struct for netlbl_domhsh_walk() */
|
|
|
|
struct netlbl_domhsh_walk_arg {
|
|
|
|
struct netlbl_audit *audit_info;
|
|
|
|
u32 doi;
|
|
|
|
};
|
|
|
|
|
2006-08-04 03:48:59 +04:00
|
|
|
/* NetLabel Generic NETLINK CIPSOv4 family */
|
2016-10-24 15:40:03 +03:00
|
|
|
static struct genl_family netlbl_cipsov4_gnl_family;
|
2006-09-26 02:56:37 +04:00
|
|
|
/* NetLabel Netlink attribute policy */
|
2007-06-05 23:38:30 +04:00
|
|
|
static const struct nla_policy netlbl_cipsov4_genl_policy[NLBL_CIPSOV4_A_MAX + 1] = {
|
2006-09-26 02:56:37 +04:00
|
|
|
[NLBL_CIPSOV4_A_DOI] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_MTYPE] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_TAG] = { .type = NLA_U8 },
|
|
|
|
[NLBL_CIPSOV4_A_TAGLST] = { .type = NLA_NESTED },
|
|
|
|
[NLBL_CIPSOV4_A_MLSLVLLOC] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_MLSLVLREM] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_MLSLVL] = { .type = NLA_NESTED },
|
|
|
|
[NLBL_CIPSOV4_A_MLSLVLLST] = { .type = NLA_NESTED },
|
|
|
|
[NLBL_CIPSOV4_A_MLSCATLOC] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_MLSCATREM] = { .type = NLA_U32 },
|
|
|
|
[NLBL_CIPSOV4_A_MLSCAT] = { .type = NLA_NESTED },
|
|
|
|
[NLBL_CIPSOV4_A_MLSCATLST] = { .type = NLA_NESTED },
|
|
|
|
};
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper Functions
|
|
|
|
*/
|
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_add_common - Parse the common sections of a ADD message
|
|
|
|
* @info: the Generic NETLINK info block
|
|
|
|
* @doi_def: the CIPSO V4 DOI definition
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Parse the common sections of a ADD message and fill in the related values
|
|
|
|
* in @doi_def. Returns zero on success, negative values on failure.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_add_common(struct genl_info *info,
|
|
|
|
struct cipso_v4_doi *doi_def)
|
|
|
|
{
|
|
|
|
struct nlattr *nla;
|
|
|
|
int nla_rem;
|
|
|
|
u32 iter = 0;
|
|
|
|
|
|
|
|
doi_def->doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
|
|
|
|
|
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 15:07:28 +03:00
|
|
|
if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_TAGLST],
|
|
|
|
NLBL_CIPSOV4_A_MAX,
|
|
|
|
netlbl_cipsov4_genl_policy,
|
|
|
|
NULL) != 0)
|
2006-09-26 02:56:37 +04:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
nla_for_each_nested(nla, info->attrs[NLBL_CIPSOV4_A_TAGLST], nla_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
if (nla_type(nla) == NLBL_CIPSOV4_A_TAG) {
|
2007-01-05 23:08:22 +03:00
|
|
|
if (iter >= CIPSO_V4_TAG_MAXCNT)
|
2006-09-26 02:56:37 +04:00
|
|
|
return -EINVAL;
|
|
|
|
doi_def->tags[iter++] = nla_get_u8(nla);
|
|
|
|
}
|
2007-01-05 23:08:22 +03:00
|
|
|
while (iter < CIPSO_V4_TAG_MAXCNT)
|
|
|
|
doi_def->tags[iter++] = CIPSO_V4_TAG_INVALID;
|
2006-09-26 02:56:37 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* NetLabel Command Handlers
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition
|
2006-09-26 02:56:37 +04:00
|
|
|
* @info: the Generic NETLINK info block
|
2008-12-31 20:54:11 +03:00
|
|
|
* @audit_info: NetLabel audit information
|
2006-08-04 03:48:59 +04:00
|
|
|
*
|
|
|
|
* Description:
|
2008-10-10 18:16:34 +04:00
|
|
|
* Create a new CIPSO_V4_MAP_TRANS DOI definition based on the given ADD
|
|
|
|
* message and add it to the CIPSO V4 engine. Return zero on success and
|
|
|
|
* non-zero on error.
|
2006-08-04 03:48:59 +04:00
|
|
|
*
|
|
|
|
*/
|
2008-12-31 20:54:11 +03:00
|
|
|
static int netlbl_cipsov4_add_std(struct genl_info *info,
|
|
|
|
struct netlbl_audit *audit_info)
|
2006-08-04 03:48:59 +04:00
|
|
|
{
|
|
|
|
int ret_val = -EINVAL;
|
|
|
|
struct cipso_v4_doi *doi_def = NULL;
|
2006-09-26 02:56:37 +04:00
|
|
|
struct nlattr *nla_a;
|
|
|
|
struct nlattr *nla_b;
|
|
|
|
int nla_a_rem;
|
|
|
|
int nla_b_rem;
|
2006-12-16 00:49:28 +03:00
|
|
|
u32 iter;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-29 01:51:47 +04:00
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_TAGLST] ||
|
2006-09-26 02:56:37 +04:00
|
|
|
!info->attrs[NLBL_CIPSOV4_A_MLSLVLLST])
|
|
|
|
return -EINVAL;
|
|
|
|
|
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 15:07:28 +03:00
|
|
|
if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
|
|
|
|
NLBL_CIPSOV4_A_MAX,
|
|
|
|
netlbl_cipsov4_genl_policy,
|
|
|
|
NULL) != 0)
|
2006-09-26 02:56:37 +04:00
|
|
|
return -EINVAL;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (doi_def == NULL)
|
|
|
|
return -ENOMEM;
|
2006-08-04 03:48:59 +04:00
|
|
|
doi_def->map.std = kzalloc(sizeof(*doi_def->map.std), GFP_KERNEL);
|
|
|
|
if (doi_def->map.std == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto add_std_failure;
|
|
|
|
}
|
2008-10-10 18:16:34 +04:00
|
|
|
doi_def->type = CIPSO_V4_MAP_TRANS;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
ret_val = netlbl_cipsov4_add_common(info, doi_def);
|
|
|
|
if (ret_val != 0)
|
2006-08-04 03:48:59 +04:00
|
|
|
goto add_std_failure;
|
2006-12-16 00:49:27 +03:00
|
|
|
ret_val = -EINVAL;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_for_each_nested(nla_a,
|
|
|
|
info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
|
|
|
|
nla_a_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSLVL) {
|
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 15:07:28 +03:00
|
|
|
if (nla_validate_nested_deprecated(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MAX,
|
|
|
|
netlbl_cipsov4_genl_policy,
|
|
|
|
NULL) != 0)
|
2017-04-12 15:34:07 +03:00
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_for_each_nested(nla_b, nla_a, nla_b_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
switch (nla_type(nla_b)) {
|
2006-09-26 02:56:37 +04:00
|
|
|
case NLBL_CIPSOV4_A_MLSLVLLOC:
|
2006-12-16 00:49:27 +03:00
|
|
|
if (nla_get_u32(nla_b) >
|
|
|
|
CIPSO_V4_MAX_LOC_LVLS)
|
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_get_u32(nla_b) >=
|
|
|
|
doi_def->map.std->lvl.local_size)
|
|
|
|
doi_def->map.std->lvl.local_size =
|
|
|
|
nla_get_u32(nla_b) + 1;
|
|
|
|
break;
|
|
|
|
case NLBL_CIPSOV4_A_MLSLVLREM:
|
2006-12-16 00:49:27 +03:00
|
|
|
if (nla_get_u32(nla_b) >
|
|
|
|
CIPSO_V4_MAX_REM_LVLS)
|
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_get_u32(nla_b) >=
|
|
|
|
doi_def->map.std->lvl.cipso_size)
|
|
|
|
doi_def->map.std->lvl.cipso_size =
|
|
|
|
nla_get_u32(nla_b) + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-08-04 03:48:59 +04:00
|
|
|
doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size,
|
|
|
|
sizeof(u32),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (doi_def->map.std->lvl.local == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto add_std_failure;
|
|
|
|
}
|
|
|
|
doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size,
|
|
|
|
sizeof(u32),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (doi_def->map.std->lvl.cipso == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto add_std_failure;
|
|
|
|
}
|
2006-12-16 00:49:28 +03:00
|
|
|
for (iter = 0; iter < doi_def->map.std->lvl.local_size; iter++)
|
|
|
|
doi_def->map.std->lvl.local[iter] = CIPSO_V4_INV_LVL;
|
|
|
|
for (iter = 0; iter < doi_def->map.std->lvl.cipso_size; iter++)
|
|
|
|
doi_def->map.std->lvl.cipso[iter] = CIPSO_V4_INV_LVL;
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_for_each_nested(nla_a,
|
|
|
|
info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
|
|
|
|
nla_a_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSLVL) {
|
2006-09-26 02:56:37 +04:00
|
|
|
struct nlattr *lvl_loc;
|
|
|
|
struct nlattr *lvl_rem;
|
|
|
|
|
|
|
|
lvl_loc = nla_find_nested(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVLLOC);
|
|
|
|
lvl_rem = nla_find_nested(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVLREM);
|
|
|
|
if (lvl_loc == NULL || lvl_rem == NULL)
|
|
|
|
goto add_std_failure;
|
|
|
|
doi_def->map.std->lvl.local[nla_get_u32(lvl_loc)] =
|
|
|
|
nla_get_u32(lvl_rem);
|
|
|
|
doi_def->map.std->lvl.cipso[nla_get_u32(lvl_rem)] =
|
|
|
|
nla_get_u32(lvl_loc);
|
|
|
|
}
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
if (info->attrs[NLBL_CIPSOV4_A_MLSCATLST]) {
|
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 15:07:28 +03:00
|
|
|
if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
|
|
|
|
NLBL_CIPSOV4_A_MAX,
|
|
|
|
netlbl_cipsov4_genl_policy,
|
|
|
|
NULL) != 0)
|
2006-09-26 02:56:37 +04:00
|
|
|
goto add_std_failure;
|
|
|
|
|
|
|
|
nla_for_each_nested(nla_a,
|
|
|
|
info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
|
|
|
|
nla_a_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSCAT) {
|
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 15:07:28 +03:00
|
|
|
if (nla_validate_nested_deprecated(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MAX,
|
|
|
|
netlbl_cipsov4_genl_policy,
|
|
|
|
NULL) != 0)
|
2006-09-26 02:56:37 +04:00
|
|
|
goto add_std_failure;
|
|
|
|
nla_for_each_nested(nla_b, nla_a, nla_b_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
switch (nla_type(nla_b)) {
|
2006-09-26 02:56:37 +04:00
|
|
|
case NLBL_CIPSOV4_A_MLSCATLOC:
|
2006-12-16 00:49:27 +03:00
|
|
|
if (nla_get_u32(nla_b) >
|
|
|
|
CIPSO_V4_MAX_LOC_CATS)
|
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_get_u32(nla_b) >=
|
|
|
|
doi_def->map.std->cat.local_size)
|
|
|
|
doi_def->map.std->cat.local_size =
|
|
|
|
nla_get_u32(nla_b) + 1;
|
|
|
|
break;
|
|
|
|
case NLBL_CIPSOV4_A_MLSCATREM:
|
2006-12-16 00:49:27 +03:00
|
|
|
if (nla_get_u32(nla_b) >
|
|
|
|
CIPSO_V4_MAX_REM_CATS)
|
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_get_u32(nla_b) >=
|
|
|
|
doi_def->map.std->cat.cipso_size)
|
|
|
|
doi_def->map.std->cat.cipso_size =
|
|
|
|
nla_get_u32(nla_b) + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
doi_def->map.std->cat.local = kcalloc(
|
2007-02-09 17:25:05 +03:00
|
|
|
doi_def->map.std->cat.local_size,
|
2006-08-04 03:48:59 +04:00
|
|
|
sizeof(u32),
|
|
|
|
GFP_KERNEL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (doi_def->map.std->cat.local == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto add_std_failure;
|
|
|
|
}
|
|
|
|
doi_def->map.std->cat.cipso = kcalloc(
|
2007-02-09 17:25:05 +03:00
|
|
|
doi_def->map.std->cat.cipso_size,
|
2006-08-04 03:48:59 +04:00
|
|
|
sizeof(u32),
|
|
|
|
GFP_KERNEL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (doi_def->map.std->cat.cipso == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
2006-08-04 03:48:59 +04:00
|
|
|
goto add_std_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
}
|
2006-12-16 00:49:28 +03:00
|
|
|
for (iter = 0; iter < doi_def->map.std->cat.local_size; iter++)
|
|
|
|
doi_def->map.std->cat.local[iter] = CIPSO_V4_INV_CAT;
|
|
|
|
for (iter = 0; iter < doi_def->map.std->cat.cipso_size; iter++)
|
|
|
|
doi_def->map.std->cat.cipso[iter] = CIPSO_V4_INV_CAT;
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_for_each_nested(nla_a,
|
|
|
|
info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
|
|
|
|
nla_a_rem)
|
2007-09-12 16:44:36 +04:00
|
|
|
if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSCAT) {
|
2006-09-26 02:56:37 +04:00
|
|
|
struct nlattr *cat_loc;
|
|
|
|
struct nlattr *cat_rem;
|
|
|
|
|
|
|
|
cat_loc = nla_find_nested(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MLSCATLOC);
|
|
|
|
cat_rem = nla_find_nested(nla_a,
|
|
|
|
NLBL_CIPSOV4_A_MLSCATREM);
|
|
|
|
if (cat_loc == NULL || cat_rem == NULL)
|
|
|
|
goto add_std_failure;
|
|
|
|
doi_def->map.std->cat.local[
|
2007-02-09 17:25:05 +03:00
|
|
|
nla_get_u32(cat_loc)] =
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_get_u32(cat_rem);
|
|
|
|
doi_def->map.std->cat.cipso[
|
2007-02-09 17:25:05 +03:00
|
|
|
nla_get_u32(cat_rem)] =
|
2006-09-26 02:56:37 +04:00
|
|
|
nla_get_u32(cat_loc);
|
|
|
|
}
|
2006-08-04 03:48:59 +04:00
|
|
|
}
|
|
|
|
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = cipso_v4_doi_add(doi_def, audit_info);
|
2006-08-04 03:48:59 +04:00
|
|
|
if (ret_val != 0)
|
|
|
|
goto add_std_failure;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
add_std_failure:
|
2015-02-02 12:40:30 +03:00
|
|
|
cipso_v4_doi_free(doi_def);
|
2006-08-04 03:48:59 +04:00
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition
|
2006-09-26 02:56:37 +04:00
|
|
|
* @info: the Generic NETLINK info block
|
2008-12-31 20:54:11 +03:00
|
|
|
* @audit_info: NetLabel audit information
|
2006-08-04 03:48:59 +04:00
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
|
|
|
|
* and add it to the CIPSO V4 engine. Return zero on success and non-zero on
|
|
|
|
* error.
|
|
|
|
*
|
|
|
|
*/
|
2008-12-31 20:54:11 +03:00
|
|
|
static int netlbl_cipsov4_add_pass(struct genl_info *info,
|
|
|
|
struct netlbl_audit *audit_info)
|
2006-08-04 03:48:59 +04:00
|
|
|
{
|
2006-09-26 02:56:37 +04:00
|
|
|
int ret_val;
|
2006-08-04 03:48:59 +04:00
|
|
|
struct cipso_v4_doi *doi_def = NULL;
|
|
|
|
|
2006-09-29 01:51:47 +04:00
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_TAGLST])
|
2006-09-26 02:56:37 +04:00
|
|
|
return -EINVAL;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (doi_def == NULL)
|
|
|
|
return -ENOMEM;
|
2006-08-04 03:48:59 +04:00
|
|
|
doi_def->type = CIPSO_V4_MAP_PASS;
|
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
ret_val = netlbl_cipsov4_add_common(info, doi_def);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto add_pass_failure;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = cipso_v4_doi_add(doi_def, audit_info);
|
2006-08-04 03:48:59 +04:00
|
|
|
if (ret_val != 0)
|
|
|
|
goto add_pass_failure;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
add_pass_failure:
|
2008-10-10 18:16:31 +04:00
|
|
|
cipso_v4_doi_free(doi_def);
|
2006-08-04 03:48:59 +04:00
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
2008-10-10 18:16:34 +04:00
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_add_local - Adds a CIPSO V4 DOI definition
|
|
|
|
* @info: the Generic NETLINK info block
|
2008-12-31 20:54:11 +03:00
|
|
|
* @audit_info: NetLabel audit information
|
2008-10-10 18:16:34 +04:00
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Create a new CIPSO_V4_MAP_LOCAL DOI definition based on the given ADD
|
|
|
|
* message and add it to the CIPSO V4 engine. Return zero on success and
|
|
|
|
* non-zero on error.
|
|
|
|
*
|
|
|
|
*/
|
2008-12-31 20:54:11 +03:00
|
|
|
static int netlbl_cipsov4_add_local(struct genl_info *info,
|
|
|
|
struct netlbl_audit *audit_info)
|
2008-10-10 18:16:34 +04:00
|
|
|
{
|
|
|
|
int ret_val;
|
|
|
|
struct cipso_v4_doi *doi_def = NULL;
|
|
|
|
|
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_TAGLST])
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
|
|
|
|
if (doi_def == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
doi_def->type = CIPSO_V4_MAP_LOCAL;
|
|
|
|
|
|
|
|
ret_val = netlbl_cipsov4_add_common(info, doi_def);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto add_local_failure;
|
|
|
|
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = cipso_v4_doi_add(doi_def, audit_info);
|
2008-10-10 18:16:34 +04:00
|
|
|
if (ret_val != 0)
|
|
|
|
goto add_local_failure;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
add_local_failure:
|
|
|
|
cipso_v4_doi_free(doi_def);
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
2006-08-04 03:48:59 +04:00
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_add - Handle an ADD message
|
|
|
|
* @skb: the NETLINK buffer
|
|
|
|
* @info: the Generic NETLINK info block
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Create a new DOI definition based on the given ADD message and add it to the
|
|
|
|
* CIPSO V4 engine. Returns zero on success, negative values on failure.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
|
|
|
|
{
|
|
|
|
int ret_val = -EINVAL;
|
2006-09-30 04:05:05 +04:00
|
|
|
struct netlbl_audit audit_info;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-29 01:51:47 +04:00
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_DOI] ||
|
|
|
|
!info->attrs[NLBL_CIPSOV4_A_MTYPE])
|
2006-09-26 02:56:37 +04:00
|
|
|
return -EINVAL;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-30 04:05:05 +04:00
|
|
|
netlbl_netlink_auditinfo(skb, &audit_info);
|
2008-12-31 20:54:11 +03:00
|
|
|
switch (nla_get_u32(info->attrs[NLBL_CIPSOV4_A_MTYPE])) {
|
2008-10-10 18:16:34 +04:00
|
|
|
case CIPSO_V4_MAP_TRANS:
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = netlbl_cipsov4_add_std(info, &audit_info);
|
2006-08-04 03:48:59 +04:00
|
|
|
break;
|
|
|
|
case CIPSO_V4_MAP_PASS:
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = netlbl_cipsov4_add_pass(info, &audit_info);
|
2006-08-04 03:48:59 +04:00
|
|
|
break;
|
2008-10-10 18:16:34 +04:00
|
|
|
case CIPSO_V4_MAP_LOCAL:
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = netlbl_cipsov4_add_local(info, &audit_info);
|
2008-10-10 18:16:34 +04:00
|
|
|
break;
|
2006-08-04 03:48:59 +04:00
|
|
|
}
|
2007-07-18 20:28:45 +04:00
|
|
|
if (ret_val == 0)
|
2008-01-29 16:37:52 +03:00
|
|
|
atomic_inc(&netlabel_mgmt_protocount);
|
2006-08-04 03:48:59 +04:00
|
|
|
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_list - Handle a LIST message
|
|
|
|
* @skb: the NETLINK buffer
|
|
|
|
* @info: the Generic NETLINK info block
|
|
|
|
*
|
|
|
|
* Description:
|
2006-09-26 02:56:37 +04:00
|
|
|
* Process a user generated LIST message and respond accordingly. While the
|
|
|
|
* response message generated by the kernel is straightforward, determining
|
|
|
|
* before hand the size of the buffer to allocate is not (we have to generate
|
|
|
|
* the message to know the size). In order to keep this function sane what we
|
|
|
|
* do is allocate a buffer of NLMSG_GOODSIZE and try to fit the response in
|
|
|
|
* that size, if we fail then we restart with a larger buffer and try again.
|
|
|
|
* We continue in this manner until we hit a limit of failed attempts then we
|
|
|
|
* give up and just send an error message. Returns zero on success and
|
|
|
|
* negative values on error.
|
2006-08-04 03:48:59 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
2006-09-26 02:56:37 +04:00
|
|
|
int ret_val;
|
|
|
|
struct sk_buff *ans_skb = NULL;
|
|
|
|
u32 nlsze_mult = 1;
|
|
|
|
void *data;
|
2006-08-04 03:48:59 +04:00
|
|
|
u32 doi;
|
2006-09-26 02:56:37 +04:00
|
|
|
struct nlattr *nla_a;
|
|
|
|
struct nlattr *nla_b;
|
|
|
|
struct cipso_v4_doi *doi_def;
|
|
|
|
u32 iter;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_DOI]) {
|
|
|
|
ret_val = -EINVAL;
|
2006-08-04 03:48:59 +04:00
|
|
|
goto list_failure;
|
2006-09-26 02:56:37 +04:00
|
|
|
}
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
list_start:
|
2006-11-11 01:10:15 +03:00
|
|
|
ans_skb = nlmsg_new(NLMSG_DEFAULT_SIZE * nlsze_mult, GFP_KERNEL);
|
2006-08-04 03:48:59 +04:00
|
|
|
if (ans_skb == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_failure;
|
|
|
|
}
|
2006-11-15 06:46:02 +03:00
|
|
|
data = genlmsg_put_reply(ans_skb, info, &netlbl_cipsov4_gnl_family,
|
|
|
|
0, NLBL_CIPSOV4_C_LIST);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (data == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
doi_def = cipso_v4_doi_getdef(doi);
|
|
|
|
if (doi_def == NULL) {
|
|
|
|
ret_val = -EINVAL;
|
2008-10-10 18:16:29 +04:00
|
|
|
goto list_failure_lock;
|
2006-09-26 02:56:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
ret_val = nla_put_u32(ans_skb, NLBL_CIPSOV4_A_MTYPE, doi_def->type);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_failure_lock;
|
|
|
|
|
2019-04-26 12:13:06 +03:00
|
|
|
nla_a = nla_nest_start_noflag(ans_skb, NLBL_CIPSOV4_A_TAGLST);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_a == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_failure_lock;
|
|
|
|
}
|
|
|
|
for (iter = 0;
|
|
|
|
iter < CIPSO_V4_TAG_MAXCNT &&
|
|
|
|
doi_def->tags[iter] != CIPSO_V4_TAG_INVALID;
|
|
|
|
iter++) {
|
|
|
|
ret_val = nla_put_u8(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_TAG,
|
|
|
|
doi_def->tags[iter]);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_failure_lock;
|
|
|
|
}
|
|
|
|
nla_nest_end(ans_skb, nla_a);
|
|
|
|
|
|
|
|
switch (doi_def->type) {
|
2008-10-10 18:16:34 +04:00
|
|
|
case CIPSO_V4_MAP_TRANS:
|
2019-04-26 12:13:06 +03:00
|
|
|
nla_a = nla_nest_start_noflag(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVLLST);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_a == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_failure_lock;
|
|
|
|
}
|
|
|
|
for (iter = 0;
|
|
|
|
iter < doi_def->map.std->lvl.local_size;
|
|
|
|
iter++) {
|
|
|
|
if (doi_def->map.std->lvl.local[iter] ==
|
|
|
|
CIPSO_V4_INV_LVL)
|
|
|
|
continue;
|
|
|
|
|
2019-04-26 12:13:06 +03:00
|
|
|
nla_b = nla_nest_start_noflag(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_b == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_retry;
|
|
|
|
}
|
|
|
|
ret_val = nla_put_u32(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVLLOC,
|
|
|
|
iter);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_retry;
|
|
|
|
ret_val = nla_put_u32(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSLVLREM,
|
|
|
|
doi_def->map.std->lvl.local[iter]);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_retry;
|
|
|
|
nla_nest_end(ans_skb, nla_b);
|
|
|
|
}
|
|
|
|
nla_nest_end(ans_skb, nla_a);
|
|
|
|
|
2019-04-26 12:13:06 +03:00
|
|
|
nla_a = nla_nest_start_noflag(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSCATLST);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_a == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_retry;
|
|
|
|
}
|
|
|
|
for (iter = 0;
|
|
|
|
iter < doi_def->map.std->cat.local_size;
|
|
|
|
iter++) {
|
|
|
|
if (doi_def->map.std->cat.local[iter] ==
|
|
|
|
CIPSO_V4_INV_CAT)
|
|
|
|
continue;
|
|
|
|
|
2019-04-26 12:13:06 +03:00
|
|
|
nla_b = nla_nest_start_noflag(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSCAT);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (nla_b == NULL) {
|
|
|
|
ret_val = -ENOMEM;
|
|
|
|
goto list_retry;
|
|
|
|
}
|
|
|
|
ret_val = nla_put_u32(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSCATLOC,
|
|
|
|
iter);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_retry;
|
|
|
|
ret_val = nla_put_u32(ans_skb,
|
|
|
|
NLBL_CIPSOV4_A_MLSCATREM,
|
|
|
|
doi_def->map.std->cat.local[iter]);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto list_retry;
|
|
|
|
nla_nest_end(ans_skb, nla_b);
|
|
|
|
}
|
|
|
|
nla_nest_end(ans_skb, nla_a);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2021-03-05 00:29:51 +03:00
|
|
|
cipso_v4_doi_putdef(doi_def);
|
2006-09-26 02:56:37 +04:00
|
|
|
rcu_read_unlock();
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
genlmsg_end(ans_skb, data);
|
2008-07-11 03:53:39 +04:00
|
|
|
return genlmsg_reply(ans_skb, info);
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
list_retry:
|
|
|
|
/* XXX - this limit is a guesstimate */
|
|
|
|
if (nlsze_mult < 4) {
|
2021-03-05 00:29:51 +03:00
|
|
|
cipso_v4_doi_putdef(doi_def);
|
2006-09-26 02:56:37 +04:00
|
|
|
rcu_read_unlock();
|
|
|
|
kfree_skb(ans_skb);
|
2008-07-15 09:28:25 +04:00
|
|
|
nlsze_mult *= 2;
|
2006-09-26 02:56:37 +04:00
|
|
|
goto list_start;
|
|
|
|
}
|
|
|
|
list_failure_lock:
|
2021-03-05 00:29:51 +03:00
|
|
|
cipso_v4_doi_putdef(doi_def);
|
2006-09-26 02:56:37 +04:00
|
|
|
rcu_read_unlock();
|
2006-08-04 03:48:59 +04:00
|
|
|
list_failure:
|
2006-09-26 02:56:37 +04:00
|
|
|
kfree_skb(ans_skb);
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_listall_cb - cipso_v4_doi_walk() callback for LISTALL
|
|
|
|
* @doi_def: the CIPSOv4 DOI definition
|
|
|
|
* @arg: the netlbl_cipsov4_doiwalk_arg structure
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* This function is designed to be used as a callback to the
|
|
|
|
* cipso_v4_doi_walk() function for use in generating a response for a LISTALL
|
|
|
|
* message. Returns the size of the message on success, negative values on
|
|
|
|
* failure.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_listall_cb(struct cipso_v4_doi *doi_def, void *arg)
|
|
|
|
{
|
|
|
|
int ret_val = -ENOMEM;
|
|
|
|
struct netlbl_cipsov4_doiwalk_arg *cb_arg = arg;
|
|
|
|
void *data;
|
|
|
|
|
2012-09-08 00:12:54 +04:00
|
|
|
data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,
|
2006-11-15 06:46:02 +03:00
|
|
|
cb_arg->seq, &netlbl_cipsov4_gnl_family,
|
|
|
|
NLM_F_MULTI, NLBL_CIPSOV4_C_LISTALL);
|
2006-09-26 02:56:37 +04:00
|
|
|
if (data == NULL)
|
|
|
|
goto listall_cb_failure;
|
|
|
|
|
|
|
|
ret_val = nla_put_u32(cb_arg->skb, NLBL_CIPSOV4_A_DOI, doi_def->doi);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto listall_cb_failure;
|
|
|
|
ret_val = nla_put_u32(cb_arg->skb,
|
|
|
|
NLBL_CIPSOV4_A_MTYPE,
|
|
|
|
doi_def->type);
|
|
|
|
if (ret_val != 0)
|
|
|
|
goto listall_cb_failure;
|
|
|
|
|
2015-01-17 00:09:00 +03:00
|
|
|
genlmsg_end(cb_arg->skb, data);
|
|
|
|
return 0;
|
2006-09-26 02:56:37 +04:00
|
|
|
|
|
|
|
listall_cb_failure:
|
|
|
|
genlmsg_cancel(cb_arg->skb, data);
|
2006-08-04 03:48:59 +04:00
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_listall - Handle a LISTALL message
|
|
|
|
* @skb: the NETLINK buffer
|
2006-09-26 02:56:37 +04:00
|
|
|
* @cb: the NETLINK callback
|
2006-08-04 03:48:59 +04:00
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Process a user generated LISTALL message and respond accordingly. Returns
|
|
|
|
* zero on success and negative values on error.
|
|
|
|
*
|
|
|
|
*/
|
2006-09-26 02:56:37 +04:00
|
|
|
static int netlbl_cipsov4_listall(struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb)
|
2006-08-04 03:48:59 +04:00
|
|
|
{
|
2006-09-26 02:56:37 +04:00
|
|
|
struct netlbl_cipsov4_doiwalk_arg cb_arg;
|
2008-10-10 18:16:29 +04:00
|
|
|
u32 doi_skip = cb->args[0];
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
cb_arg.nl_cb = cb;
|
|
|
|
cb_arg.skb = skb;
|
|
|
|
cb_arg.seq = cb->nlh->nlmsg_seq;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
cipso_v4_doi_walk(&doi_skip, netlbl_cipsov4_listall_cb, &cb_arg);
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-26 02:56:37 +04:00
|
|
|
cb->args[0] = doi_skip;
|
|
|
|
return skb->len;
|
2006-08-04 03:48:59 +04:00
|
|
|
}
|
|
|
|
|
2008-10-10 18:16:31 +04:00
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_remove_cb - netlbl_cipsov4_remove() callback for REMOVE
|
|
|
|
* @entry: LSM domain mapping entry
|
|
|
|
* @arg: the netlbl_domhsh_walk_arg structure
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* This function is intended for use by netlbl_cipsov4_remove() as the callback
|
|
|
|
* for the netlbl_domhsh_walk() function; it removes LSM domain map entries
|
|
|
|
* which are associated with the CIPSO DOI specified in @arg. Returns zero on
|
|
|
|
* success, negative values on failure.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_remove_cb(struct netlbl_dom_map *entry, void *arg)
|
|
|
|
{
|
|
|
|
struct netlbl_domhsh_walk_arg *cb_arg = arg;
|
|
|
|
|
2013-08-02 22:45:08 +04:00
|
|
|
if (entry->def.type == NETLBL_NLTYPE_CIPSOV4 &&
|
|
|
|
entry->def.cipso->doi == cb_arg->doi)
|
2008-10-10 18:16:31 +04:00
|
|
|
return netlbl_domhsh_remove_entry(entry, cb_arg->audit_info);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-04 03:48:59 +04:00
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_remove - Handle a REMOVE message
|
|
|
|
* @skb: the NETLINK buffer
|
|
|
|
* @info: the Generic NETLINK info block
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Process a user generated REMOVE message and respond accordingly. Returns
|
|
|
|
* zero on success, negative values on failure.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
2006-09-26 02:56:37 +04:00
|
|
|
int ret_val = -EINVAL;
|
2008-10-10 18:16:31 +04:00
|
|
|
struct netlbl_domhsh_walk_arg cb_arg;
|
2006-09-30 04:05:05 +04:00
|
|
|
struct netlbl_audit audit_info;
|
2008-10-10 18:16:31 +04:00
|
|
|
u32 skip_bkt = 0;
|
|
|
|
u32 skip_chain = 0;
|
2006-08-04 03:48:59 +04:00
|
|
|
|
2006-09-30 04:05:05 +04:00
|
|
|
if (!info->attrs[NLBL_CIPSOV4_A_DOI])
|
|
|
|
return -EINVAL;
|
2006-09-29 01:51:47 +04:00
|
|
|
|
2006-09-30 04:05:05 +04:00
|
|
|
netlbl_netlink_auditinfo(skb, &audit_info);
|
2008-12-31 20:54:11 +03:00
|
|
|
cb_arg.doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
|
2008-10-10 18:16:31 +04:00
|
|
|
cb_arg.audit_info = &audit_info;
|
|
|
|
ret_val = netlbl_domhsh_walk(&skip_bkt, &skip_chain,
|
|
|
|
netlbl_cipsov4_remove_cb, &cb_arg);
|
|
|
|
if (ret_val == 0 || ret_val == -ENOENT) {
|
2008-12-31 20:54:11 +03:00
|
|
|
ret_val = cipso_v4_doi_remove(cb_arg.doi, &audit_info);
|
2008-10-10 18:16:31 +04:00
|
|
|
if (ret_val == 0)
|
|
|
|
atomic_dec(&netlabel_mgmt_protocount);
|
|
|
|
}
|
2006-09-30 04:05:05 +04:00
|
|
|
|
2006-08-04 03:48:59 +04:00
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NetLabel Generic NETLINK Command Definitions
|
|
|
|
*/
|
|
|
|
|
2020-10-03 00:49:54 +03:00
|
|
|
static const struct genl_small_ops netlbl_cipsov4_ops[] = {
|
2008-02-18 09:33:16 +03:00
|
|
|
{
|
2006-08-04 03:48:59 +04:00
|
|
|
.cmd = NLBL_CIPSOV4_C_ADD,
|
2019-04-26 15:07:31 +03:00
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
2006-09-26 02:56:37 +04:00
|
|
|
.flags = GENL_ADMIN_PERM,
|
2006-08-04 03:48:59 +04:00
|
|
|
.doit = netlbl_cipsov4_add,
|
|
|
|
.dumpit = NULL,
|
2008-02-18 09:33:16 +03:00
|
|
|
},
|
|
|
|
{
|
2006-08-04 03:48:59 +04:00
|
|
|
.cmd = NLBL_CIPSOV4_C_REMOVE,
|
2019-04-26 15:07:31 +03:00
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
2006-09-26 02:56:37 +04:00
|
|
|
.flags = GENL_ADMIN_PERM,
|
2006-08-04 03:48:59 +04:00
|
|
|
.doit = netlbl_cipsov4_remove,
|
|
|
|
.dumpit = NULL,
|
2008-02-18 09:33:16 +03:00
|
|
|
},
|
|
|
|
{
|
2006-08-04 03:48:59 +04:00
|
|
|
.cmd = NLBL_CIPSOV4_C_LIST,
|
2019-04-26 15:07:31 +03:00
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
2006-08-04 03:48:59 +04:00
|
|
|
.flags = 0,
|
|
|
|
.doit = netlbl_cipsov4_list,
|
|
|
|
.dumpit = NULL,
|
2008-02-18 09:33:16 +03:00
|
|
|
},
|
|
|
|
{
|
2006-08-04 03:48:59 +04:00
|
|
|
.cmd = NLBL_CIPSOV4_C_LISTALL,
|
2019-04-26 15:07:31 +03:00
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
2006-08-04 03:48:59 +04:00
|
|
|
.flags = 0,
|
2006-09-26 02:56:37 +04:00
|
|
|
.doit = NULL,
|
|
|
|
.dumpit = netlbl_cipsov4_listall,
|
2008-02-18 09:33:16 +03:00
|
|
|
},
|
2006-08-04 03:48:59 +04:00
|
|
|
};
|
|
|
|
|
2016-10-24 15:40:05 +03:00
|
|
|
static struct genl_family netlbl_cipsov4_gnl_family __ro_after_init = {
|
2016-10-24 15:40:03 +03:00
|
|
|
.hdrsize = 0,
|
|
|
|
.name = NETLBL_NLTYPE_CIPSOV4_NAME,
|
|
|
|
.version = NETLBL_PROTO_VERSION,
|
|
|
|
.maxattr = NLBL_CIPSOV4_A_MAX,
|
genetlink: make policy common to family
Since maxattr is common, the policy can't really differ sanely,
so make it common as well.
The only user that did in fact manage to make a non-common policy
is taskstats, which has to be really careful about it (since it's
still using a common maxattr!). This is no longer supported, but
we can fake it using pre_doit.
This reduces the size of e.g. nl80211.o (which has lots of commands):
text data bss dec hex filename
398745 14323 2240 415308 6564c net/wireless/nl80211.o (before)
397913 14331 2240 414484 65314 net/wireless/nl80211.o (after)
--------------------------------
-832 +8 0 -824
Which is obviously just 8 bytes for each command, and an added 8
bytes for the new policy pointer. I'm not sure why the ops list is
counted as .text though.
Most of the code transformations were done using the following spatch:
@ops@
identifier OPS;
expression POLICY;
@@
struct genl_ops OPS[] = {
...,
{
- .policy = POLICY,
},
...
};
@@
identifier ops.OPS;
expression ops.POLICY;
identifier fam;
expression M;
@@
struct genl_family fam = {
.ops = OPS,
.maxattr = M,
+ .policy = POLICY,
...
};
This also gets rid of devlink_nl_cmd_region_read_dumpit() accessing
the cb->data as ops, which we want to change in a later genl patch.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-03-22 00:51:02 +03:00
|
|
|
.policy = netlbl_cipsov4_genl_policy,
|
2016-10-24 15:40:03 +03:00
|
|
|
.module = THIS_MODULE,
|
2020-10-03 00:49:54 +03:00
|
|
|
.small_ops = netlbl_cipsov4_ops,
|
|
|
|
.n_small_ops = ARRAY_SIZE(netlbl_cipsov4_ops),
|
2016-10-24 15:40:03 +03:00
|
|
|
};
|
|
|
|
|
2006-08-04 03:48:59 +04:00
|
|
|
/*
|
|
|
|
* NetLabel Generic NETLINK Protocol Functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netlbl_cipsov4_genl_init - Register the CIPSOv4 NetLabel component
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Register the CIPSOv4 packet NetLabel component with the Generic NETLINK
|
|
|
|
* mechanism. Returns zero on success, negative values on failure.
|
|
|
|
*
|
|
|
|
*/
|
2008-02-18 09:33:57 +03:00
|
|
|
int __init netlbl_cipsov4_genl_init(void)
|
2006-08-04 03:48:59 +04:00
|
|
|
{
|
2016-10-24 15:40:03 +03:00
|
|
|
return genl_register_family(&netlbl_cipsov4_gnl_family);
|
2006-08-04 03:48:59 +04:00
|
|
|
}
|