Commit da4ed551 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

switchdev: pass pointer to fib_info instead of copy 



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: 850d0cbc ("switchdev: remove pointers from switchdev objects")
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc327f89

drivers/net/ethernet/rocker/rocker_ofdpa.c

+2 −2
Original line number Diff line number Diff line
@@ -2727,7 +2727,7 @@ static int ofdpa_port_obj_fib4_add(struct rocker_port *rocker_port, 


	return ofdpa_port_fib_ipv4(ofdpa_port, trans,

				   htonl(fib4->dst), fib4->dst_len,

				   &fib4->fi, fib4->tb_id, 0);

				   fib4->fi, fib4->tb_id, 0);

}



static int ofdpa_port_obj_fib4_del(struct rocker_port *rocker_port,
@@ -2737,7 +2737,7 @@ static int ofdpa_port_obj_fib4_del(struct rocker_port *rocker_port, 


	return ofdpa_port_fib_ipv4(ofdpa_port, NULL,

				   htonl(fib4->dst), fib4->dst_len,

				   &fib4->fi, fib4->tb_id,

				   fib4->fi, fib4->tb_id,

				   OFDPA_OP_FLAG_REMOVE);

}

include/net/switchdev.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,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;

net/switchdev/switchdev.c

+2 −4
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, 
		.obj.id = SWITCHDEV_OBJ_ID_IPV4_FIB,

		.dst = dst,

		.dst_len = dst_len,

		.fi = fi,

		.tos = tos,

		.type = type,

		.nlflags = nlflags,
@@ -1196,8 +1197,6 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, 
	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.

	 */
@@ -1242,6 +1241,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
		.obj.id = SWITCHDEV_OBJ_ID_IPV4_FIB,

		.dst = dst,

		.dst_len = dst_len,

		.fi = fi,

		.tos = tos,

		.type = type,

		.nlflags = 0,
@@ -1250,8 +1250,6 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
	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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE