From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] bridge-utils: add upstream patch fixing sysfs writes
Date: Thu, 15 Oct 2015 16:16:19 +0200 [thread overview]
Message-ID: <1444918579-30926-1-git-send-email-patrickdepinguin@gmail.com> (raw)
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
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 <thomas.de.schampheleire@gmail.com>
---
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
diff --git a/package/bridge-utils/0003-sysfs-write-fixes.patch b/package/bridge-utils/0003-sysfs-write-fixes.patch
new file mode 100644
index 0000000..2f36209
--- /dev/null
+++ b/package/bridge-utils/0003-sysfs-write-fixes.patch
@@ -0,0 +1,79 @@
+commit bb9970a9df95837e39d680021b1f73d231e85406
+Author: Stephen Hemminger <shemminger@vyatta.com>
+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)
--
1.9.5
next reply other threads:[~2015-10-15 14:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 14:16 Thomas De Schampheleire [this message]
2015-10-15 14:20 ` [Buildroot] [PATCH 1/1] bridge-utils: add upstream patch fixing sysfs writes Baruch Siach
2015-10-15 14:31 ` Thomas De Schampheleire
2015-10-15 14:33 ` Baruch Siach
2015-10-15 20:55 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444918579-30926-1-git-send-email-patrickdepinguin@gmail.com \
--to=patrickdepinguin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.