[jpirko/libteam] 20d45a: initscripts: make ifup/ifdown scripts usable by if...
by GitHub
Branch: refs/heads/master
Home: https://github.com/jpirko/libteam
Commit: 20d45a1e026c27f4ec37383d4bb2c446a2744c02
https://github.com/jpirko/libteam/commit/20d45a1e026c27f4ec37383d4bb2c446...
Author: Jiri Pirko <jiri(a)resnulli.us>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M teamd/redhat/initscripts/network-scripts/ifdown-Team
M teamd/redhat/initscripts/network-scripts/ifdown-TeamPort
M teamd/redhat/initscripts/network-scripts/ifup-Team
M teamd/redhat/initscripts/network-scripts/ifup-TeamPort
M teamd/redhat/initscripts_systemd/network-scripts/ifdown-Team
M teamd/redhat/initscripts_systemd/network-scripts/ifdown-TeamPort
M teamd/redhat/initscripts_systemd/network-scripts/ifup-Team
M teamd/redhat/initscripts_systemd/network-scripts/ifup-TeamPort
Log Message:
-----------
initscripts: make ifup/ifdown scripts usable by ifup/ifdown-eth scripts
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
9 years, 8 months
[PATCH] Fix potential small memory leak
by Michele Baldessari
In __reg_val() in case the 'if (per_port && tdport)' condition is
true, we leak the previously allocated char *subpath.
Instead jump to 'errorout' which frees it, just like the other error
paths do in this function.
Signed-off-by: Michele Baldessari <michele(a)acksyn.org>
---
teamd/teamd_state.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/teamd/teamd_state.c b/teamd/teamd_state.c
index 6191ea123954..ddfd85505e52 100644
--- a/teamd/teamd_state.c
+++ b/teamd/teamd_state.c
@@ -98,8 +98,10 @@ int __reg_val(struct teamd_context *ctx, const struct teamd_state_val *val,
}
if (val->per_port)
per_port = true;
- if (per_port && tdport)
- return -EINVAL;
+ if (per_port && tdport) {
+ err = -EINVAL;
+ goto errout;
+ }
if (val->type == TEAMD_STATE_ITEM_TYPE_NODE) {
int i;
--
1.8.5.3
9 years, 8 months