Blame SOURCES/0002-fipvlan-segfault-return-after-vlan-create-in-create_.patch
|
|
ebec02 |
From 1583ea89319e2941e1e96145e3b99ae8749d4283 Mon Sep 17 00:00:00 2001
|
|
|
ebec02 |
From: Chris Leech <cleech@redhat.com>
|
|
|
ebec02 |
Date: Thu, 22 Jan 2015 09:56:18 -0800
|
|
|
ebec02 |
Subject: [PATCH V2 2/2] fipvlan: segfault, return after vlan create in
|
|
|
ebec02 |
create_and_start_vlan
|
|
|
ebec02 |
|
|
|
ebec02 |
---
|
|
|
ebec02 |
fipvlan.c | 8 ++++----
|
|
|
ebec02 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
ebec02 |
|
|
|
ebec02 |
diff --git a/fipvlan.c b/fipvlan.c
|
|
|
ebec02 |
index 211da53..1feb41d 100644
|
|
|
ebec02 |
--- a/fipvlan.c
|
|
|
ebec02 |
+++ b/fipvlan.c
|
|
|
ebec02 |
@@ -635,12 +635,12 @@ create_and_start_vlan(struct fcf *fcf, bool vn2vn)
|
|
|
ebec02 |
snprintf(vlan_name, IFNAMSIZ, "%s.%d%s",
|
|
|
ebec02 |
real_dev->ifname, fcf->vlan, config.suffix);
|
|
|
ebec02 |
rc = vlan_create(fcf->ifindex, fcf->vlan, vlan_name);
|
|
|
ebec02 |
- if (rc < 0) {
|
|
|
ebec02 |
+ if (rc < 0)
|
|
|
ebec02 |
printf("Failed to create VLAN device %s\n\t%s\n",
|
|
|
ebec02 |
vlan_name, strerror(-rc));
|
|
|
ebec02 |
- return rc;
|
|
|
ebec02 |
- }
|
|
|
ebec02 |
- printf("Created VLAN device %s\n", vlan_name);
|
|
|
ebec02 |
+ else
|
|
|
ebec02 |
+ printf("Created VLAN device %s\n", vlan_name);
|
|
|
ebec02 |
+ return rc;
|
|
|
ebec02 |
}
|
|
|
ebec02 |
if (!config.start)
|
|
|
ebec02 |
return rc;
|
|
|
ebec02 |
--
|
|
|
ebec02 |
2.1.0
|
|
|
ebec02 |
|