2019-05-30 01:57:50 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2008-09-23 05:04:30 +02:00
|
|
|
/*
|
|
|
|
* File: pn_netlink.c
|
|
|
|
*
|
|
|
|
* Phonet netlink interface
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Nokia Corporation.
|
|
|
|
*
|
2012-06-14 00:29:03 +02:00
|
|
|
* Authors: Sakari Ailus <sakari.ailus@nokia.com>
|
|
|
|
* Remi Denis-Courmont
|
2008-09-23 05:04:30 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/netlink.h>
|
|
|
|
#include <linux/phonet.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 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2008-09-23 05:04:30 +02:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/phonet/pn_dev.h>
|
|
|
|
|
2009-10-14 02:48:29 +02:00
|
|
|
/* Device address handling */
|
|
|
|
|
2008-09-23 05:04:30 +02:00
|
|
|
static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
|
2012-09-07 22:12:54 +02:00
|
|
|
u32 portid, u32 seq, int event);
|
2008-09-23 05:04:30 +02:00
|
|
|
|
2009-06-24 03:07:44 +02:00
|
|
|
void phonet_address_notify(int event, struct net_device *dev, u8 addr)
|
2008-09-23 05:04:30 +02:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = -ENOBUFS;
|
|
|
|
|
|
|
|
skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
|
|
|
|
nla_total_size(1), GFP_KERNEL);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
err = fill_addr(skb, dev, addr, 0, 0, event);
|
|
|
|
if (err < 0) {
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto errout;
|
|
|
|
}
|
2009-02-25 08:18:28 +01:00
|
|
|
rtnl_notify(skb, dev_net(dev), 0,
|
|
|
|
RTNLGRP_PHONET_IFADDR, NULL, GFP_KERNEL);
|
|
|
|
return;
|
2008-09-23 05:04:30 +02:00
|
|
|
errout:
|
2009-11-02 23:41:28 +01:00
|
|
|
rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_IFADDR, err);
|
2008-09-23 05:04:30 +02:00
|
|
|
}
|
|
|
|
|
2008-09-30 11:51:18 +02:00
|
|
|
static const struct nla_policy ifa_phonet_policy[IFA_MAX+1] = {
|
|
|
|
[IFA_LOCAL] = { .type = NLA_U8 },
|
|
|
|
};
|
|
|
|
|
2017-04-16 18:48:24 +02:00
|
|
|
static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
|
|
|
|
struct netlink_ext_ack *extack)
|
2008-09-23 05:04:30 +02:00
|
|
|
{
|
2008-09-30 11:51:18 +02:00
|
|
|
struct net *net = sock_net(skb->sk);
|
|
|
|
struct nlattr *tb[IFA_MAX+1];
|
2008-09-23 05:04:30 +02:00
|
|
|
struct net_device *dev;
|
2008-09-30 11:51:18 +02:00
|
|
|
struct ifaddrmsg *ifm;
|
2008-09-23 05:04:30 +02:00
|
|
|
int err;
|
|
|
|
u8 pnaddr;
|
|
|
|
|
2014-04-23 23:29:27 +02:00
|
|
|
if (!netlink_capable(skb, CAP_NET_ADMIN))
|
2012-11-16 04:03:00 +01:00
|
|
|
return -EPERM;
|
|
|
|
|
2014-04-23 23:29:27 +02:00
|
|
|
if (!netlink_capable(skb, CAP_SYS_ADMIN))
|
2008-09-23 05:04:30 +02:00
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
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 14:07:28 +02:00
|
|
|
err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
|
|
|
|
ifa_phonet_policy, extack);
|
2008-09-30 11:51:18 +02:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2008-09-23 05:04:30 +02:00
|
|
|
|
2008-09-30 11:51:18 +02:00
|
|
|
ifm = nlmsg_data(nlh);
|
|
|
|
if (tb[IFA_LOCAL] == NULL)
|
2008-09-23 05:04:30 +02:00
|
|
|
return -EINVAL;
|
2008-09-30 11:51:18 +02:00
|
|
|
pnaddr = nla_get_u8(tb[IFA_LOCAL]);
|
|
|
|
if (pnaddr & 3)
|
|
|
|
/* Phonet addresses only have 6 high-order bits */
|
2008-09-23 05:04:30 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-09-30 11:51:18 +02:00
|
|
|
dev = __dev_get_by_index(net, ifm->ifa_index);
|
2008-09-23 05:04:30 +02:00
|
|
|
if (dev == NULL)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2008-09-30 11:51:18 +02:00
|
|
|
if (nlh->nlmsg_type == RTM_NEWADDR)
|
|
|
|
err = phonet_address_add(dev, pnaddr);
|
|
|
|
else
|
|
|
|
err = phonet_address_del(dev, pnaddr);
|
2008-09-23 05:04:30 +02:00
|
|
|
if (!err)
|
2009-06-24 03:07:44 +02:00
|
|
|
phonet_address_notify(nlh->nlmsg_type, dev, pnaddr);
|
2008-09-23 05:04:30 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
|
2012-09-07 22:12:54 +02:00
|
|
|
u32 portid, u32 seq, int event)
|
2008-09-23 05:04:30 +02:00
|
|
|
{
|
|
|
|
struct ifaddrmsg *ifm;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
|
2012-09-07 22:12:54 +02:00
|
|
|
nlh = nlmsg_put(skb, portid, seq, event, sizeof(*ifm), 0);
|
2008-09-30 11:51:18 +02:00
|
|
|
if (nlh == NULL)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
ifm = nlmsg_data(nlh);
|
2008-09-23 05:04:30 +02:00
|
|
|
ifm->ifa_family = AF_PHONET;
|
|
|
|
ifm->ifa_prefixlen = 0;
|
|
|
|
ifm->ifa_flags = IFA_F_PERMANENT;
|
2008-09-30 11:51:18 +02:00
|
|
|
ifm->ifa_scope = RT_SCOPE_LINK;
|
2008-09-23 05:04:30 +02:00
|
|
|
ifm->ifa_index = dev->ifindex;
|
2012-03-30 05:15:10 +02:00
|
|
|
if (nla_put_u8(skb, IFA_LOCAL, addr))
|
|
|
|
goto nla_put_failure;
|
2015-01-16 22:09:00 +01:00
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
return 0;
|
2008-09-23 05:04:30 +02:00
|
|
|
|
2008-09-30 11:51:18 +02:00
|
|
|
nla_put_failure:
|
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
2008-09-23 05:04:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
|
|
|
|
{
|
2009-01-23 04:00:30 +01:00
|
|
|
struct phonet_device_list *pndevs;
|
2008-09-23 05:04:30 +02:00
|
|
|
struct phonet_device *pnd;
|
|
|
|
int dev_idx = 0, dev_start_idx = cb->args[0];
|
|
|
|
int addr_idx = 0, addr_start_idx = cb->args[1];
|
|
|
|
|
2009-01-23 04:00:30 +01:00
|
|
|
pndevs = phonet_device_list(sock_net(skb->sk));
|
2009-11-18 19:08:26 +01:00
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(pnd, &pndevs->list, list) {
|
2008-09-23 05:04:30 +02:00
|
|
|
u8 addr;
|
|
|
|
|
|
|
|
if (dev_idx > dev_start_idx)
|
|
|
|
addr_start_idx = 0;
|
|
|
|
if (dev_idx++ < dev_start_idx)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
addr_idx = 0;
|
2010-03-11 13:07:49 +01:00
|
|
|
for_each_set_bit(addr, pnd->addrs, 64) {
|
2008-09-23 05:04:30 +02:00
|
|
|
if (addr_idx++ < addr_start_idx)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (fill_addr(skb, pnd->netdev, addr << 2,
|
2012-09-07 22:12:54 +02:00
|
|
|
NETLINK_CB(cb->skb).portid,
|
2009-09-09 01:59:51 +02:00
|
|
|
cb->nlh->nlmsg_seq, RTM_NEWADDR) < 0)
|
2008-09-23 05:04:30 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2009-11-18 19:08:26 +01:00
|
|
|
rcu_read_unlock();
|
2008-09-23 05:04:30 +02:00
|
|
|
cb->args[0] = dev_idx;
|
|
|
|
cb->args[1] = addr_idx;
|
|
|
|
|
|
|
|
return skb->len;
|
|
|
|
}
|
|
|
|
|
2009-10-14 02:48:29 +02:00
|
|
|
/* Routes handling */
|
|
|
|
|
|
|
|
static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst,
|
2012-09-07 22:12:54 +02:00
|
|
|
u32 portid, u32 seq, int event)
|
2009-10-14 02:48:29 +02:00
|
|
|
{
|
|
|
|
struct rtmsg *rtm;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
|
2012-09-07 22:12:54 +02:00
|
|
|
nlh = nlmsg_put(skb, portid, seq, event, sizeof(*rtm), 0);
|
2009-10-14 02:48:29 +02:00
|
|
|
if (nlh == NULL)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
rtm = nlmsg_data(nlh);
|
|
|
|
rtm->rtm_family = AF_PHONET;
|
|
|
|
rtm->rtm_dst_len = 6;
|
|
|
|
rtm->rtm_src_len = 0;
|
|
|
|
rtm->rtm_tos = 0;
|
|
|
|
rtm->rtm_table = RT_TABLE_MAIN;
|
|
|
|
rtm->rtm_protocol = RTPROT_STATIC;
|
|
|
|
rtm->rtm_scope = RT_SCOPE_UNIVERSE;
|
|
|
|
rtm->rtm_type = RTN_UNICAST;
|
|
|
|
rtm->rtm_flags = 0;
|
2012-03-30 05:15:10 +02:00
|
|
|
if (nla_put_u8(skb, RTA_DST, dst) ||
|
|
|
|
nla_put_u32(skb, RTA_OIF, dev->ifindex))
|
|
|
|
goto nla_put_failure;
|
2015-01-16 22:09:00 +01:00
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
return 0;
|
2009-10-14 02:48:29 +02:00
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void rtm_phonet_notify(int event, struct net_device *dev, u8 dst)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = -ENOBUFS;
|
|
|
|
|
|
|
|
skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
|
|
|
|
nla_total_size(1) + nla_total_size(4), GFP_KERNEL);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
err = fill_route(skb, dev, dst, 0, 0, event);
|
|
|
|
if (err < 0) {
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto errout;
|
|
|
|
}
|
|
|
|
rtnl_notify(skb, dev_net(dev), 0,
|
|
|
|
RTNLGRP_PHONET_ROUTE, NULL, GFP_KERNEL);
|
|
|
|
return;
|
|
|
|
errout:
|
2009-11-02 23:41:28 +01:00
|
|
|
rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_ROUTE, err);
|
2009-10-14 02:48:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct nla_policy rtm_phonet_policy[RTA_MAX+1] = {
|
|
|
|
[RTA_DST] = { .type = NLA_U8 },
|
|
|
|
[RTA_OIF] = { .type = NLA_U32 },
|
|
|
|
};
|
|
|
|
|
2017-04-16 18:48:24 +02:00
|
|
|
static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
|
|
|
|
struct netlink_ext_ack *extack)
|
2009-10-14 02:48:29 +02:00
|
|
|
{
|
|
|
|
struct net *net = sock_net(skb->sk);
|
|
|
|
struct nlattr *tb[RTA_MAX+1];
|
|
|
|
struct net_device *dev;
|
|
|
|
struct rtmsg *rtm;
|
|
|
|
int err;
|
|
|
|
u8 dst;
|
|
|
|
|
2014-04-23 23:29:27 +02:00
|
|
|
if (!netlink_capable(skb, CAP_NET_ADMIN))
|
2012-11-16 04:03:00 +01:00
|
|
|
return -EPERM;
|
|
|
|
|
2014-04-23 23:29:27 +02:00
|
|
|
if (!netlink_capable(skb, CAP_SYS_ADMIN))
|
2009-10-14 02:48:29 +02:00
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
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 14:07:28 +02:00
|
|
|
err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
|
|
|
|
rtm_phonet_policy, extack);
|
2009-10-14 02:48:29 +02:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
rtm = nlmsg_data(nlh);
|
|
|
|
if (rtm->rtm_table != RT_TABLE_MAIN || rtm->rtm_type != RTN_UNICAST)
|
|
|
|
return -EINVAL;
|
|
|
|
if (tb[RTA_DST] == NULL || tb[RTA_OIF] == NULL)
|
|
|
|
return -EINVAL;
|
|
|
|
dst = nla_get_u8(tb[RTA_DST]);
|
|
|
|
if (dst & 3) /* Phonet addresses only have 6 high-order bits */
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
dev = __dev_get_by_index(net, nla_get_u32(tb[RTA_OIF]));
|
|
|
|
if (dev == NULL)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
if (nlh->nlmsg_type == RTM_NEWROUTE)
|
|
|
|
err = phonet_route_add(dev, dst);
|
|
|
|
else
|
|
|
|
err = phonet_route_del(dev, dst);
|
|
|
|
if (!err)
|
|
|
|
rtm_phonet_notify(nlh->nlmsg_type, dev, dst);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
|
|
|
|
{
|
|
|
|
struct net *net = sock_net(skb->sk);
|
2015-01-19 12:15:24 +01:00
|
|
|
u8 addr;
|
2009-10-14 02:48:29 +02:00
|
|
|
|
2011-04-28 00:56:07 +02:00
|
|
|
rcu_read_lock();
|
2015-01-19 12:15:24 +01:00
|
|
|
for (addr = cb->args[0]; addr < 64; addr++) {
|
|
|
|
struct net_device *dev = phonet_route_get_rcu(net, addr << 2);
|
2009-10-14 02:48:29 +02:00
|
|
|
|
|
|
|
if (!dev)
|
|
|
|
continue;
|
|
|
|
|
2015-01-19 12:15:24 +01:00
|
|
|
if (fill_route(skb, dev, addr << 2, NETLINK_CB(cb->skb).portid,
|
|
|
|
cb->nlh->nlmsg_seq, RTM_NEWROUTE) < 0)
|
|
|
|
goto out;
|
2009-10-14 02:48:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2011-04-28 00:56:07 +02:00
|
|
|
rcu_read_unlock();
|
2015-01-19 12:15:24 +01:00
|
|
|
cb->args[0] = addr;
|
2009-10-14 02:48:29 +02:00
|
|
|
|
|
|
|
return skb->len;
|
|
|
|
}
|
|
|
|
|
2009-01-23 04:00:28 +01:00
|
|
|
int __init phonet_netlink_register(void)
|
2008-09-23 05:04:30 +02:00
|
|
|
{
|
2017-12-02 21:44:07 +01:00
|
|
|
int err = rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWADDR,
|
|
|
|
addr_doit, NULL, 0);
|
2009-01-23 04:00:28 +01:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-12-02 21:44:07 +01:00
|
|
|
/* Further rtnl_register_module() cannot fail */
|
|
|
|
rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELADDR,
|
|
|
|
addr_doit, NULL, 0);
|
|
|
|
rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETADDR,
|
|
|
|
NULL, getaddr_dumpit, 0);
|
|
|
|
rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_NEWROUTE,
|
|
|
|
route_doit, NULL, 0);
|
|
|
|
rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_DELROUTE,
|
|
|
|
route_doit, NULL, 0);
|
|
|
|
rtnl_register_module(THIS_MODULE, PF_PHONET, RTM_GETROUTE,
|
|
|
|
NULL, route_dumpit, 0);
|
2009-01-23 04:00:28 +01:00
|
|
|
return 0;
|
2008-09-23 05:04:30 +02:00
|
|
|
}
|