| From foo@baz Sun Aug 26 09:13:00 CEST 2018 |
| From: John Hurley <john.hurley@netronome.com> |
| Date: Fri, 27 Jul 2018 20:56:52 -0700 |
| Subject: nfp: flower: fix port metadata conversion bug |
| |
| From: John Hurley <john.hurley@netronome.com> |
| |
| [ Upstream commit ee614c871014045b45fae149b7245fc22a0bbdd8 ] |
| |
| Function nfp_flower_repr_get_type_and_port expects an enum nfp_repr_type |
| return value but, if the repr type is unknown, returns a value of type |
| enum nfp_flower_cmsg_port_type. This means that if FW encodes the port |
| ID in a way the driver does not understand instead of dropping the frame |
| driver may attribute it to a physical port (uplink) provided the port |
| number is less than physical port count. |
| |
| Fix this and ensure a net_device of NULL is returned if the repr can not |
| be determined. |
| |
| Fixes: 1025351a88a4 ("nfp: add flower app") |
| Signed-off-by: John Hurley <john.hurley@netronome.com> |
| Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/netronome/nfp/flower/main.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/netronome/nfp/flower/main.c |
| +++ b/drivers/net/ethernet/netronome/nfp/flower/main.c |
| @@ -79,7 +79,7 @@ nfp_flower_repr_get_type_and_port(struct |
| return NFP_REPR_TYPE_VF; |
| } |
| |
| - return NFP_FLOWER_CMSG_PORT_TYPE_UNSPEC; |
| + return __NFP_REPR_TYPE_MAX; |
| } |
| |
| static struct net_device * |
| @@ -90,6 +90,8 @@ nfp_flower_repr_get(struct nfp_app *app, |
| u8 port = 0; |
| |
| repr_type = nfp_flower_repr_get_type_and_port(app, port_id, &port); |
| + if (repr_type > NFP_REPR_TYPE_MAX) |
| + return NULL; |
| |
| reprs = rcu_dereference(app->reprs[repr_type]); |
| if (!reprs) |
