lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 003/142] net: dont return invalid table id error when we fall back to PF_UNSPEC
    Date
    From: Sabrina Dubroca <sd@queasysnail.net>

    [ Upstream commit 41b4bd986f86331efc599b9a3f5fb86ad92e9af9 ]

    In case we can't find a ->dumpit callback for the requested
    (family,type) pair, we fall back to (PF_UNSPEC,type). In effect, we're
    in the same situation as if userspace had requested a PF_UNSPEC
    dump. For RTM_GETROUTE, that handler is rtnl_dump_all, which calls all
    the registered RTM_GETROUTE handlers.

    The requested table id may or may not exist for all of those
    families. commit ae677bbb4441 ("net: Don't return invalid table id
    error when dumping all families") fixed the problem when userspace
    explicitly requests a PF_UNSPEC dump, but missed the fallback case.

    For example, when we pass ipv6.disable=1 to a kernel with
    CONFIG_IP_MROUTE=y and CONFIG_IP_MROUTE_MULTIPLE_TABLES=y,
    the (PF_INET6, RTM_GETROUTE) handler isn't registered, so we end up in
    rtnl_dump_all, and listing IPv6 routes will unexpectedly print:

    # ip -6 r
    Error: ipv4: MR table does not exist.
    Dump terminated

    commit ae677bbb4441 introduced the dump_all_families variable, which
    gets set when userspace requests a PF_UNSPEC dump. However, we can't
    simply set the family to PF_UNSPEC in rtnetlink_rcv_msg in the
    fallback case to get dump_all_families == true, because some messages
    types (for example RTM_GETRULE and RTM_GETNEIGH) only register the
    PF_UNSPEC handler and use the family to filter in the kernel what is
    dumped to userspace. We would then export more entries, that userspace
    would have to filter. iproute does that, but other programs may not.

    Instead, this patch removes dump_all_families and updates the
    RTM_GETROUTE handlers to check if the family that is being dumped is
    their own. When it's not, which covers both the intentional PF_UNSPEC
    dumps (as dump_all_families did) and the fallback case, ignore the
    missing table id error.

    Fixes: cb167893f41e ("net: Plumb support for filtering ipv4 and ipv6 multicast route dumps")
    Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
    Reviewed-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/net/ip_fib.h | 1 -
    net/ipv4/fib_frontend.c | 3 +--
    net/ipv4/ipmr.c | 2 +-
    net/ipv6/ip6_fib.c | 2 +-
    net/ipv6/ip6mr.c | 2 +-
    5 files changed, 4 insertions(+), 6 deletions(-)

    --- a/include/net/ip_fib.h
    +++ b/include/net/ip_fib.h
    @@ -244,7 +244,6 @@ struct fib_dump_filter {
    u32 table_id;
    /* filter_set is an optimization that an entry is set */
    bool filter_set;
    - bool dump_all_families;
    bool dump_routes;
    bool dump_exceptions;
    unsigned char protocol;
    --- a/net/ipv4/fib_frontend.c
    +++ b/net/ipv4/fib_frontend.c
    @@ -928,7 +928,6 @@ int ip_valid_fib_dump_req(struct net *ne
    else
    filter->dump_exceptions = false;

    - filter->dump_all_families = (rtm->rtm_family == AF_UNSPEC);
    filter->flags = rtm->rtm_flags;
    filter->protocol = rtm->rtm_protocol;
    filter->rt_type = rtm->rtm_type;
    @@ -1000,7 +999,7 @@ static int inet_dump_fib(struct sk_buff
    if (filter.table_id) {
    tb = fib_get_table(net, filter.table_id);
    if (!tb) {
    - if (filter.dump_all_families)
    + if (rtnl_msg_family(cb->nlh) != PF_INET)
    return skb->len;

    NL_SET_ERR_MSG(cb->extack, "ipv4: FIB table does not exist");
    --- a/net/ipv4/ipmr.c
    +++ b/net/ipv4/ipmr.c
    @@ -2609,7 +2609,7 @@ static int ipmr_rtm_dumproute(struct sk_

    mrt = ipmr_get_table(sock_net(skb->sk), filter.table_id);
    if (!mrt) {
    - if (filter.dump_all_families)
    + if (rtnl_msg_family(cb->nlh) != RTNL_FAMILY_IPMR)
    return skb->len;

    NL_SET_ERR_MSG(cb->extack, "ipv4: MR table does not exist");
    --- a/net/ipv6/ip6_fib.c
    +++ b/net/ipv6/ip6_fib.c
    @@ -613,7 +613,7 @@ static int inet6_dump_fib(struct sk_buff
    if (arg.filter.table_id) {
    tb = fib6_get_table(net, arg.filter.table_id);
    if (!tb) {
    - if (arg.filter.dump_all_families)
    + if (rtnl_msg_family(cb->nlh) != PF_INET6)
    goto out;

    NL_SET_ERR_MSG_MOD(cb->extack, "FIB table does not exist");
    --- a/net/ipv6/ip6mr.c
    +++ b/net/ipv6/ip6mr.c
    @@ -2498,7 +2498,7 @@ static int ip6mr_rtm_dumproute(struct sk

    mrt = ip6mr_get_table(sock_net(skb->sk), filter.table_id);
    if (!mrt) {
    - if (filter.dump_all_families)
    + if (rtnl_msg_family(cb->nlh) != RTNL_FAMILY_IP6MR)
    return skb->len;

    NL_SET_ERR_MSG_MOD(cb->extack, "MR table does not exist");

    \
     
     \ /
      Last update: 2020-06-01 20:07    [W:4.100 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site