[PATCH rhel6-branch master] Fix SIGSEGV for netwowrk --device=<MAC> which is not found (#697432)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We ended up with netDev_set == 1 and netDev == NULL in the case
which resulted in SIGSEGV later. The patch sets netDev to value
of --device option which leads to asking in UI as in other similar
cases.

Resolves: rhbz#697432

The patch is tested on master, and is not relevant for F15.

---
 loader/net.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 725c160..c303fbe 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1686,9 +1686,8 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
     if (!noksdev) {
         if (device) {
             /* If --device=MAC was given, translate into a device name now. */
-            if (index(device, ':') != NULL)
-                loaderData->netDev = iface_mac2device(device);
-            else
+            if (index(device, ':') == NULL ||
+                (loaderData->netDev = iface_mac2device(device)) == NULL)
                 loaderData->netDev = strdup(device);
 
             loaderData->netDev_set = 1;
-- 
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux