summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libnl/libnl
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-04-22 16:49:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-24 17:55:15 +0100
commit965770c0f7df3186421b7a89ae7c4a72e14990d5 (patch)
tree1c8221f97e0c319309e591618be0faa40c5fd776 /meta/recipes-support/libnl/libnl
parent2a309746fbc4169bf9928725c44810c1098d8b6b (diff)
downloadpoky-965770c0f7df3186421b7a89ae7c4a72e14990d5.tar.gz
libnl: update to 3.2.24
Remove patch that is now in the upstream version Add new package for idiag libraries. (From OE-Core rev: 407db800da02032e07e94b0b837a89cfb3e204a0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl/libnl')
-rw-r--r--meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch b/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch
deleted file mode 100644
index 6d2c8ff72d..0000000000
--- a/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 6f37b439af7e96104aadd8ec3ae8d3882df8d102 Mon Sep 17 00:00:00 2001
2From: Jiri Pirko <jiri@resnulli.us>
3Date: Wed, 21 Aug 2013 14:40:34 +0200
4Subject: [PATCH] fix double free caused by freeing link af_data in
5 rtnl_link_set_family()
6
7Introduced by commit 8026fe2e3a9089eff3f5a06ee6e3cc78d96334ed ("link:
8Free and realloc af specific data upon rtnl_link_set_family()")
9
10link->l_af_data[link->l_af_ops->ao_family] is freed here but not set to
11zero. That leads to double free made by link_free_data->do_foreach_af.
12
13Fix this by setting link->l_af_data[link->l_af_ops->ao_family] to zero
14rigth after free.
15
16Signed-off-by: Jiri Pirko <jiri@resnulli.us>
17Signed-off-by: Thomas Graf <tgraf@suug.ch>
18---
19 lib/route/link.c | 4 +++-
20 1 file changed, 3 insertions(+), 1 deletion(-)
21
22diff --git a/lib/route/link.c b/lib/route/link.c
23index a73e1db..0bb90a0 100644
24--- a/lib/route/link.c
25+++ b/lib/route/link.c
26@@ -1762,9 +1762,11 @@ void rtnl_link_set_family(struct rtnl_link *link, int family)
27 link->l_family = family;
28 link->ce_mask |= LINK_ATTR_FAMILY;
29
30- if (link->l_af_ops)
31+ if (link->l_af_ops) {
32 af_free(link, link->l_af_ops,
33 link->l_af_data[link->l_af_ops->ao_family], NULL);
34+ link->l_af_data[link->l_af_ops->ao_family] = NULL;
35+ }
36
37 link->l_af_ops = af_lookup_and_alloc(link, family);
38 }
39--
401.8.4
41