diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2018-07-18 15:31:23 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-07-20 16:07:12 -0700 |
| commit | 1c2c30c1439c64fe8c8c68e5ceeadf4148befaa4 (patch) | |
| tree | 6947e3f62c8c83e869ca2330b77340935ccfb89a | |
| parent | 3dc38c444b5fc88f9f0ba342a2e7db4c6566719f (diff) | |
| download | meta-openembedded-contrib-1c2c30c1439c64fe8c8c68e5ceeadf4148befaa4.tar.gz | |
numactl: 2.0.11 -> 2.0.12
License-Update: license file name updated
format changed, but most content is remain
add mail of related person.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 39 insertions, 32 deletions
diff --git a/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch b/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch new file mode 100644 index 0000000000..0497613dda --- /dev/null +++ b/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch @@ -0,0 +1,35 @@ +From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Wed, 18 Jul 2018 09:43:55 +0800 +Subject: [PATCH] fix NULL pointer problem + +return 0 if distance_table is NULL + +Upstream-Status: Pending + +read_distance_table() maybe return 0, but distance_table is not set, +if distance_table is used, and will lead to SEGFAULT + +Signed-off-by: Roy Li <rongqing.li@windriver.com> + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + distance.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/distance.c b/distance.c +index 8d472af..6a6e886 100644 +--- a/distance.c ++++ b/distance.c +@@ -113,6 +113,8 @@ int numa_distance(int a, int b) + int err = read_distance_table(); + if (err < 0) + return 0; ++ if(!distance_table) ++ return 0; + } + if ((unsigned)a >= distance_numnodes || (unsigned)b >= distance_numnodes) + return 0; +-- +2.7.4 + diff --git a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch b/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch deleted file mode 100644 index 53952aef95..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] return 0 if distance_table is NULL - -Upstream-Status: Pending - -read_distance_table() maybe return 0, but distance_table is not set, -if distance_table is used, and will lead to SEGFAULT - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - distance.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/distance.c b/distance.c -index 4a26972..c6ca021 100755 ---- a/distance.c -+++ b/distance.c -@@ -113,6 +113,8 @@ int numa_distance(int a, int b) - int err = read_distance_table(); - if (err < 0) - return 0; -+ if (!distance_table) -+ return 0; - } - return distance_table[a * distance_numnodes + b]; - } --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb index b9cbcf09d0..c1c387986c 100644 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-oe/recipes-support/numactl/numactl_git.bb @@ -9,13 +9,13 @@ RDEPENDS_${PN} = "perl" inherit autotools-brokensep ptest -LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" +LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "ea3a70681c2f523fe58e1d44527f478ca76db74e" -PV = "2.0.11+git${SRCPV}" +SRCREV = "841253d1313b01a968c380cae4f498f20c46e5aa" +PV = "2.0.12+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ - file://fix-null-pointer.patch \ + file://0001-fix-NULL-pointer-problem.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ |