diff options
| author |   Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2015-11-23 12:34:12 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-01-29 19:19:15 -0800 |
| commit | 50e09d1d3543a7fcd3d831d3ef30c13b3116fb1d (patch) | |
| tree | 5ee524f392d0bedd149459f8078e457d8c6cb043 | |
| parent | 7bc138a365e20653ddfb9229561e3e9e50b89ee8 (diff) | |
| download | meta-openembedded-contrib-50e09d1d3543a7fcd3d831d3ef30c13b3116fb1d.tar.gz | |
quagga: fix segment fault when stopping ospf6d
In ospf6_clean, the variable ospf6 might be NULL causing segment fault
when stopping ospf6d. Check the variable before referencing it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch | 28 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch b/meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch new file mode 100644 index 0000000000..f08bb572da --- /dev/null +++ b/meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +Subject: ospf6d: check ospf6 before using it in ospf6_clean + +The ospf6 variable might be 'NULL' causing segment fault error. +Check it before referencing it. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + ospf6d/ospf6d.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c +index 3cdd5c1..e3bf1af 100644 +--- a/ospf6d/ospf6d.c ++++ b/ospf6d/ospf6d.c +@@ -1892,6 +1892,8 @@ ospf6_init (void) + void + ospf6_clean (void) + { ++ if (ospf6 == NULL) ++ return; + if (ospf6->route_table) + ospf6_route_remove_all (ospf6->route_table); + if (ospf6->brouter_table) +-- +1.9.1 + diff --git a/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb b/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb index 09c4e7d286..cecf4385c1 100644 --- a/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb +++ b/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb @@ -1,6 +1,7 @@ require quagga.inc SRC_URI += "file://babel-close-the-stdout-stderr-as-in-other-daemons.patch \ + file://0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch \ " SRC_URI[md5sum] = "7986bdc2fe6027d4c9216f7f5791e718" |