lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 06/75] switchdev: pass pointer to fib_info instead of copy
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jiri Pirko <jiri@mellanox.com>

    [ Upstream commit da4ed55165d41b1073f9a476f1c18493e9bf8c8e ]

    The problem is that fib_info->nh is [0] so the struct fib_info
    allocation size depends on number of nexthops. If we just copy fib_info,
    we do not copy the nexthops info and driver accesses memory which is not
    ours.

    Given the fact that fib4 does not defer operations and therefore it does
    not need copy, just pass the pointer down to drivers as it was done
    before.

    Fixes: 850d0cbc91 ("switchdev: remove pointers from switchdev objects")
    Signed-off-by: Jiri Pirko <jiri@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/rocker/rocker.c | 4 ++--
    include/net/switchdev.h | 2 +-
    net/switchdev/switchdev.c | 6 ++----
    3 files changed, 5 insertions(+), 7 deletions(-)

    --- a/drivers/net/ethernet/rocker/rocker.c
    +++ b/drivers/net/ethernet/rocker/rocker.c
    @@ -4475,7 +4475,7 @@ static int rocker_port_obj_add(struct ne
    fib4 = SWITCHDEV_OBJ_IPV4_FIB(obj);
    err = rocker_port_fib_ipv4(rocker_port, trans,
    htonl(fib4->dst), fib4->dst_len,
    - &fib4->fi, fib4->tb_id, 0);
    + fib4->fi, fib4->tb_id, 0);
    break;
    case SWITCHDEV_OBJ_ID_PORT_FDB:
    err = rocker_port_fdb_add(rocker_port, trans,
    @@ -4547,7 +4547,7 @@ static int rocker_port_obj_del(struct ne
    fib4 = SWITCHDEV_OBJ_IPV4_FIB(obj);
    err = rocker_port_fib_ipv4(rocker_port, NULL,
    htonl(fib4->dst), fib4->dst_len,
    - &fib4->fi, fib4->tb_id,
    + fib4->fi, fib4->tb_id,
    ROCKER_OP_FLAG_REMOVE);
    break;
    case SWITCHDEV_OBJ_ID_PORT_FDB:
    --- a/include/net/switchdev.h
    +++ b/include/net/switchdev.h
    @@ -88,7 +88,7 @@ struct switchdev_obj_ipv4_fib {
    struct switchdev_obj obj;
    u32 dst;
    int dst_len;
    - struct fib_info fi;
    + struct fib_info *fi;
    u8 tos;
    u8 type;
    u32 nlflags;
    --- a/net/switchdev/switchdev.c
    +++ b/net/switchdev/switchdev.c
    @@ -1169,6 +1169,7 @@ int switchdev_fib_ipv4_add(u32 dst, int
    .obj.id = SWITCHDEV_OBJ_ID_IPV4_FIB,
    .dst = dst,
    .dst_len = dst_len,
    + .fi = fi,
    .tos = tos,
    .type = type,
    .nlflags = nlflags,
    @@ -1177,8 +1178,6 @@ int switchdev_fib_ipv4_add(u32 dst, int
    struct net_device *dev;
    int err = 0;

    - memcpy(&ipv4_fib.fi, fi, sizeof(ipv4_fib.fi));
    -
    /* Don't offload route if using custom ip rules or if
    * IPv4 FIB offloading has been disabled completely.
    */
    @@ -1222,6 +1221,7 @@ int switchdev_fib_ipv4_del(u32 dst, int
    .obj.id = SWITCHDEV_OBJ_ID_IPV4_FIB,
    .dst = dst,
    .dst_len = dst_len,
    + .fi = fi,
    .tos = tos,
    .type = type,
    .nlflags = 0,
    @@ -1230,8 +1230,6 @@ int switchdev_fib_ipv4_del(u32 dst, int
    struct net_device *dev;
    int err = 0;

    - memcpy(&ipv4_fib.fi, fi, sizeof(ipv4_fib.fi));
    -
    if (!(fi->fib_flags & RTNH_F_OFFLOAD))
    return 0;


    \
     
     \ /
      Last update: 2016-06-23 02:01    [W:4.194 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site