| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> |
| 3 | Date: Wed, 18 Jul 2018 09:43:55 +0800 |
| 4 | Subject: [PATCH] fix NULL pointer problem |
| 5 | |
| 6 | return 0 if distance_table is NULL |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | read_distance_table() maybe return 0, but distance_table is not set, |
| 11 | if distance_table is used, and will lead to SEGFAULT |
| 12 | |
| 13 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 14 | |
| 15 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 16 | --- |
| 17 | distance.c | 2 ++ |
| 18 | 1 file changed, 2 insertions(+) |
| 19 | |
| 20 | diff --git a/distance.c b/distance.c |
| 21 | index 8d472af..6a6e886 100644 |
| 22 | --- a/distance.c |
| 23 | +++ b/distance.c |
| 24 | @@ -113,6 +113,8 @@ int numa_distance(int a, int b) |
| 25 | int err = read_distance_table(); |
| 26 | if (err < 0) |
| 27 | return 0; |
| 28 | + if(!distance_table) |
| 29 | + return 0; |
| 30 | } |
| 31 | if ((unsigned)a >= distance_numnodes || (unsigned)b >= distance_numnodes) |
| 32 | return 0; |
| 33 | -- |
| 34 | 2.7.4 |
| 35 | |