X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_if.c;h=219a260683902c16265e255b8b5eab41380a8cd2;hb=a8643e447601201aabd1159966bd716e48378f97;hp=5b695cfc003a582a3a86359beebbecb45ca3a481;hpb=850b6b3b9f8c38b42e315c2c07d232a33b82da3e;p=sliver-openvswitch.git

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index 5b695cfc0..219a26068 100644
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -209,7 +209,7 @@ struct sysfs_ops ovs_brport_sysfs_ops = {
 int ovs_dp_sysfs_add_if(struct vport *p)
 {
 	struct datapath *dp = p->dp;
-	struct vport *local_port = rtnl_dereference(dp->ports[OVSP_LOCAL]);
+	struct vport *local_port = ovs_vport_rtnl(dp, OVSP_LOCAL);
 	struct brport_attribute **a;
 	int err;
 
@@ -217,6 +217,14 @@ int ovs_dp_sysfs_add_if(struct vport *p)
 	if (!p->ops->get_kobj)
 		return -ENOENT;
 
+#ifdef CONFIG_NET_NS
+	/* Due to bug in 2.6.32 kernel, sysfs_create_group() could panic
+	 * in other namespace than init_net. Following check is to avoid it. */
+
+	if (!p->kobj.sd)
+		return -ENOENT;
+#endif
+
 	err = kobject_add(&p->kobj, p->ops->get_kobj(p),
 			  SYSFS_BRIDGE_PORT_ATTR);
 	if (err)