1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
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.
Fix incorrect sysfs path in br_set.
[Thomas De Schampheleire: update commit message only]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
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)
|
