bridge-utils: add upstream patch fixing sysfs writes

PATCH Superseded Thomas De Schampheleire 3 participants 5 messages Oct 15, 2015

lore

Share & tools

lore

Thomas De Schampheleire

author

2015-10-15 14:16 UTC #0 lore raw

PATCH 1/1 bridge-utils: add upstream patch fixing sysfs writes

From: Thomas De Schampheleire <[email protected]>

Add upstream patch that fixes a sysfs path in br_set.
The patch is on top of the latest release 1.5, which already dates from 2011.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
 package/bridge-utils/0003-sysfs-write-fixes.patch | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch

package/bridge-utils/0003-sysfs-write-fixes.patch new file +79 -0

new file mode 100644
index 0000000..2f36209
@@ -0,0 +1,79 @@
+commit bb9970a9df95837e39d680021b1f73d231e85406
+Author: Stephen Hemminger <[email protected]>
+Date:   Tue May 3 09:52:43 2011 -0700
+
+    Check error returns from write to sysfs
+    
+    Add helper function to check write to sysfs files.
+
+
+[tdescham: this patch also fixes an incorrect path in br_set]
+
+diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
+index aa8bc36..1e83925 100644
+--- a/libbridge/libbridge_devif.c
++++ b/libbridge/libbridge_devif.c
+@@ -280,25 +280,38 @@ fallback:
+ 	return old_get_port_info(brname, port, info);
+ }
+ 
++static int set_sysfs(const char *path, unsigned long value)
++{
++	int fd, ret = 0, cc;
++	char buf[32];
++
++	fd = open(path, O_WRONLY);
++	if (fd < 0)
++		return -1;
++
++	cc = snprintf(buf, sizeof(buf), "%lu\n", value);
++	if (write(fd, buf, cc) < 0)
++		ret = -1;
++	close(fd);
++
++	return ret;
++}
++
+ 
+ static int br_set(const char *bridge, const char *name,
+ 		  unsigned long value, unsigned long oldcode)
+ {
+ 	int ret;
+ 	char path[SYSFS_PATH_MAX];
+-	FILE *f;
+ 
+-	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
++	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s",
++		 bridge, name);
+ 
+-	f = fopen(path, "w");
+-	if (f) {
+-		ret = fprintf(f, "%ld\n", value);
+-		fclose(f);
+-	} else {
++	if ((ret = set_sysfs(path, value)) < 0) {
+ 		/* fallback to old ioctl */
+ 		struct ifreq ifr;
+ 		unsigned long args[4] = { oldcode, value, 0, 0 };
+-		
++
+ 		strncpy(ifr.ifr_name, bridge, IFNAMSIZ);
+ 		ifr.ifr_data = (char *) &args;
+ 		ret = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
+@@ -348,14 +361,10 @@ static int port_set(const char *bridge, const char *ifname,
+ {
+ 	int ret;
+ 	char path[SYSFS_PATH_MAX];
+-	FILE *f;
+ 
+ 	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport/%s", ifname, name);
+-	f = fopen(path, "w");
+-	if (f) {
+-		ret = fprintf(f, "%ld\n", value);
+-		fclose(f);
+-	} else {
++
++	if ((ret = set_sysfs(path, value)) < 0) {
+ 		int index = get_portno(bridge, ifname);
+ 
+ 		if (index < 0)

Signature · 1 line

1.9.5

Baruch Siach

2015-10-15 14:20 UTC #1 lore raw

PATCH 1/1 bridge-utils: add upstream patch fixing sysfs writes

Hi Thomas,

Quoted 18 lines · Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>
Add upstream patch that fixes a sysfs path in br_set.
The patch is on top of the latest release 1.5, which already dates from 2011.
Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/bridge-utils/0003-sysfs-write-fixes.patch | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch
package/bridge-utils/0003-sysfs-write-fixes.patch new file +0 -0
new file mode 100644
index 0000000..2f36209

package/bridge-utils/0003-sysfs-write-fixes.patch line 10

Quoted 10 lines

package/bridge-utils/0003-sysfs-write-fixes.patch new file +10 -0

@@ -0,0 +1,79 @@
+commit bb9970a9df95837e39d680021b1f73d231e85406
+Author: Stephen Hemminger <[email protected]>
+Date:   Tue May 3 09:52:43 2011 -0700
+
+    Check error returns from write to sysfs
+    
+    Add helper function to check write to sysfs files.
+
+
+[tdescham: this patch also fixes an incorrect path in br_set]

Your sign-off on this patch is missing.

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Thomas De Schampheleire

author

2015-10-15 14:31 UTC #2 lore raw

PATCH 1/1 bridge-utils: add upstream patch fixing sysfs writes

Quoted 25 lines · Baruch Siach

Hi Thomas,
Quoted 22 lines · Thomas De Schampheleire
From: Thomas De Schampheleire <[email protected]>
Add upstream patch that fixes a sysfs path in br_set.
The patch is on top of the latest release 1.5, which already dates from 2011.
Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/bridge-utils/0003-sysfs-write-fixes.patch | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch
package/bridge-utils/0003-sysfs-write-fixes.patch new file +4 -0
new file mode 100644
index 0000000..2f36209
@@ -0,0 +1,79 @@
+commit bb9970a9df95837e39d680021b1f73d231e85406
+Author: Stephen Hemminger <[email protected]>
+Date:   Tue May 3 09:52:43 2011 -0700
+

Quoted 8 lines

package/bridge-utils/0003-sysfs-write-fixes.patch line 10
Quoted 6 lines
package/bridge-utils/0003-sysfs-write-fixes.patch new file +6 -0
+    Check error returns from write to sysfs
+
+    Add helper function to check write to sysfs files.
+
+
+[tdescham: this patch also fixes an incorrect path in br_set]
Your sign-off on this patch is missing.

Is that also necessary for untouched, imported patches?

(I've been out of buildroot development for a while :-o)

Baruch Siach

2015-10-15 14:33 UTC #3 lore raw

PATCH 1/1 bridge-utils: add upstream patch fixing sysfs writes

Hi Thomas,

Quoted 33 lines · Thomas De Schampheleire

Quoted 23 lines · Baruch Siach
Quoted 22 lines · Thomas De Schampheleire
From: Thomas De Schampheleire <[email protected]>
Add upstream patch that fixes a sysfs path in br_set.
The patch is on top of the latest release 1.5, which already dates from 2011.
Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/bridge-utils/0003-sysfs-write-fixes.patch | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch
package/bridge-utils/0003-sysfs-write-fixes.patch new file +4 -0
new file mode 100644
index 0000000..2f36209
@@ -0,0 +1,79 @@
+commit bb9970a9df95837e39d680021b1f73d231e85406
+Author: Stephen Hemminger <[email protected]>
+Date:   Tue May 3 09:52:43 2011 -0700
+
Quoted 8 lines
package/bridge-utils/0003-sysfs-write-fixes.patch line 10
Quoted 6 lines
package/bridge-utils/0003-sysfs-write-fixes.patch new file +6 -0
+    Check error returns from write to sysfs
+
+    Add helper function to check write to sysfs files.
+
+
+[tdescham: this patch also fixes an incorrect path in br_set]
Your sign-off on this patch is missing.

Quoted 3 lines

Is that also necessary for untouched, imported patches?
(I've been out of buildroot development for a while :-o)

Yes. It's a legal statement. See
http://elinux.org/Developer_Certificate_Of_Origin.

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Peter Korsgaard

2015-10-15 20:55 UTC #4 lore raw

PATCH 1/1 bridge-utils: add upstream patch fixing sysfs writes

In reply to Thomas De Schampheleire

Quoted 3 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Is that also necessary for untouched, imported patches?

Yes.

Quoted 1 line

(I've been out of buildroot development for a while :-o)

Welcome back! ;)

Signature · 1 line

Bye, Peter Korsgaard