nfp: fix variable dereferenced before check in nfp_app_ctrl_rx_raw()
authorJakub Kicinski <jakub.kicinski@netronome.com>
Tue, 31 Jul 2018 03:33:15 +0000 (20:33 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 31 Jul 2018 07:28:19 +0000 (09:28 +0200)
'app' is dereferenced before used for the devlink trace point.
In case FW is buggy and sends a control message to a VF queue
we should make sure app is not NULL.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
drivers/net/ethernet/netronome/nfp/nfp_app.h

index ccb244cf6c302c6964cb9215316b25bc02defca6..4e1eb3395648951ac7a2a2c7e677f1afdd20a07c 100644 (file)
@@ -392,10 +392,11 @@ static inline void nfp_app_ctrl_rx(struct nfp_app *app, struct sk_buff *skb)
 static inline void
 nfp_app_ctrl_rx_raw(struct nfp_app *app, const void *data, unsigned int len)
 {
-       trace_devlink_hwmsg(priv_to_devlink(app->pf), true, 0, data, len);
+       if (!app || !app->type->ctrl_msg_rx_raw)
+               return;
 
-       if (app && app->type->ctrl_msg_rx_raw)
-               app->type->ctrl_msg_rx_raw(app, data, len);
+       trace_devlink_hwmsg(priv_to_devlink(app->pf), true, 0, data, len);
+       app->type->ctrl_msg_rx_raw(app, data, len);
 }
 
 static inline int nfp_app_eswitch_mode_get(struct nfp_app *app, u16 *mode)