[dpdk-dev] kni: error rollback with kni_dev_remove could cause a kernel crash

Message ID 1472132490-27425-1-git-send-email-ferruh.yigit@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Ferruh Yigit Aug. 25, 2016, 1:41 p.m. UTC
  From: ZhouYates <zhouyates@gmail.com>

Signed-off-by: ZhouYates <zhouyates@gmail.com>
---
 lib/librte_eal/linuxapp/kni/kni_misc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
  

Comments

Ferruh Yigit Aug. 25, 2016, 1:49 p.m. UTC | #1
Hi ZhouYates,

On 8/25/2016 2:41 PM, Ferruh Yigit wrote:
> From: ZhouYates <zhouyates@gmail.com>

I have re-sent your exact patch which was sent as attachment.
Thank you for the patch, can you please follow contribution guide for
next version of the patch? More details on:
http://dpdk.org/doc/guides/contributing/patches.html#sending-patches

> 
> Signed-off-by: ZhouYates <zhouyates@gmail.com>
> ---
>  lib/librte_eal/linuxapp/kni/kni_misc.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
> index 59d15ca..7ef17f5 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_misc.c
> +++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
> @@ -448,7 +448,6 @@ kni_ioctl_create(struct net *net,
>  
>  	kni = netdev_priv(net_dev);
>  
> -	kni->net_dev = net_dev;
>  	kni->group_id = dev_info.group_id;
>  	kni->core_id = dev_info.core_id;
>  	strncpy(kni->name, dev_info.name, RTE_KNI_NAMESIZE);
> @@ -561,6 +560,9 @@ kni_ioctl_create(struct net *net,
>  		kni_dev_remove(kni);

But this cause allocated net_dev not freed here ...

>  		return -ENODEV;
>  	}
> +	/*Set the kni->net_dev when the net_dev has registered success.
> +	 * Avoid unregistering unregistered net_dev by kni_dev_remove.*/

Can you please use multi line comment syntax same as rest of the
document. Or perhaps first line can be enough.


> +	kni->net_dev = net_dev;
>  
>  #ifdef RTE_KNI_VHOST
>  	kni_vhost_init(kni);
>
  

Patch

diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
index 59d15ca..7ef17f5 100644
--- a/lib/librte_eal/linuxapp/kni/kni_misc.c
+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
@@ -448,7 +448,6 @@  kni_ioctl_create(struct net *net,
 
 	kni = netdev_priv(net_dev);
 
-	kni->net_dev = net_dev;
 	kni->group_id = dev_info.group_id;
 	kni->core_id = dev_info.core_id;
 	strncpy(kni->name, dev_info.name, RTE_KNI_NAMESIZE);
@@ -561,6 +560,9 @@  kni_ioctl_create(struct net *net,
 		kni_dev_remove(kni);
 		return -ENODEV;
 	}
+	/*Set the kni->net_dev when the net_dev has registered success.
+	 * Avoid unregistering unregistered net_dev by kni_dev_remove.*/
+	kni->net_dev = net_dev;
 
 #ifdef RTE_KNI_VHOST
 	kni_vhost_init(kni);