linux/drivers/net/wireless/intel/iwlwifi
Johannes Berg 8cb081746c 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-27 17:07:21 -04:00
..
cfg wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
dvm iwlwifi: dvm: no need to check return value of debugfs_create functions 2019-02-20 20:47:56 +02:00
fw wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
mvm netlink: make validation more configurable for future strictness 2019-04-27 17:07:21 -04:00
pcie wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
iwl-agn-hw.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-config.h wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
iwl-context-info-gen3.h
iwl-context-info.h iwlwifi: pcie: set RB size according to user settings 2018-09-28 08:57:27 +03:00
iwl-csr.h wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
iwl-dbg-tlv.c iwlwifi: dbg_ini: align to FW api version 1 2019-03-22 12:59:42 +02:00
iwl-dbg-tlv.h iwlwifi: trans: support loading ini TLVs from external file 2018-11-23 13:01:06 +02:00
iwl-debug.c iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-debug.h iwlwifi: pcie: add TPT oriented prints 2019-02-14 11:29:42 +02:00
iwl-devtrace-data.h iwlwifi: trace: change trace to trace one TB at a time 2018-10-08 10:35:27 +03:00
iwl-devtrace-io.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-devtrace-iwlwifi.h iwlwifi: remove ucode error tracepoint 2018-09-28 08:57:22 +03:00
iwl-devtrace-msg.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-devtrace-ucode.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-devtrace.c iwlwifi: remove ucode error tracepoint 2018-09-28 08:57:22 +03:00
iwl-devtrace.h
iwl-drv.c iwlwifi: iwl-drv: no need to check return value of debugfs_create functions 2019-02-20 20:47:56 +02:00
iwl-drv.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-eeprom-parse.c iwlwifi: eeprom-parse: use struct_size() in kzalloc() 2019-02-20 20:47:54 +02:00
iwl-eeprom-parse.h iwlwifi: move iwl_nvm_check_version() into dvm 2018-12-14 13:04:46 +02:00
iwl-eeprom-read.c iwlwifi: refactor NIC init sequence 2019-02-04 12:28:09 +02:00
iwl-eeprom-read.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-fh.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-io.c iwlwifi: add force NMI for AX210 devices 2019-02-14 11:29:48 +02:00
iwl-io.h iwlwifi: align to new periphery address space for AX210 family 2019-02-14 11:29:48 +02:00
iwl-modparams.h iwlwifi: move iwl_enable_{rx,tx}_ampdu to iwl-modparams.h 2019-01-29 16:10:30 +02:00
iwl-nvm-parse.c iwlwifi: trust calling function 2019-04-03 11:19:58 +03:00
iwl-nvm-parse.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-op-mode.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-phy-db.c iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-phy-db.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-prph.h iwlwifi: dbg: add DRAM monitor support for AX210 device family 2019-03-22 12:59:41 +02:00
iwl-scd.h iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-trans.c iwlwifi: remove all occurrences of the FSF address paragraph 2018-08-31 11:38:33 +03:00
iwl-trans.h wireless-drivers-next patches for 5.2 2019-04-18 11:07:55 -07:00
Kconfig iwlwifi: make IWLWIFI depend on CFG80211 2019-01-16 20:09:05 +02:00
Makefile iwlwifi: trans: parse and store debug ini TLVs 2018-11-23 13:01:06 +02:00