evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IPoIB: Fix crash in dev_open error flow

Browse source 
If napi has never been enabled when calling ipoib_ib_dev_stop, a
kernel crash occurs, because the verbs layer completion handler
(ipoib_ib_completion) calls napi_schedule unconditionally.

If the napi structure passed in the napi_schedule call has not
been initialized, napi will crash.

The cleanest solution is to simply enable napi before calling
ipoib_ib_dev_stop in the dev_open error flow. (dev_stop then
immediately disables napi).

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Erez Shitrit 2013-10-16 17:37:47 +03:00 • committed by Roland Dreier
parent 959f58544b
commit c2bb5628db
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/infiniband/ulp/ipoib/ipoib_ib.c
View file

@ -685,15 +685,13 @@ int ipoib_ib_dev_open(struct net_device *dev)
ret = ipoib_ib_post_receives(dev); ret = ipoib_ib_post_receives(dev);
if (ret) { if (ret) {
ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret); ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret);
ipoib_ib_dev_stop(dev, 1); goto dev_stop;
return -1;
} }
ret = ipoib_cm_dev_open(dev); ret = ipoib_cm_dev_open(dev);
if (ret) { if (ret) {
ipoib_warn(priv, "ipoib_cm_dev_open returned %d\n", ret); ipoib_warn(priv, "ipoib_cm_dev_open returned %d\n", ret);
ipoib_ib_dev_stop(dev, 1); goto dev_stop;
return -1;
} }
clear_bit(IPOIB_STOP_REAPER, &priv->flags); clear_bit(IPOIB_STOP_REAPER, &priv->flags);
@ -704,6 +702,11 @@ int ipoib_ib_dev_open(struct net_device *dev)
napi_enable(&priv->napi); napi_enable(&priv->napi);
return 0; return 0;
dev_stop:
if (!test_and_set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags))
napi_enable(&priv->napi);
ipoib_ib_dev_stop(dev, 1);
return -1;
} }
static void ipoib_pkey_dev_check_presence(struct net_device *dev) static void ipoib_pkey_dev_check_presence(struct net_device *dev)