From mboxrd@z Thu Jan 1 00:00:00 1970 From: lixiaokeng Subject: [PATCH 6/6] libmultipath: check udev* return value in _find_path_by_syspath Date: Tue, 15 Sep 2020 12:42:16 +0800 Message-ID: <40f72a77-5dcc-89e4-e164-d19e0da10699@huawei.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Content-Language: en-GB To: Christophe Varoqui , Martin Wilck , Benjamin Marzinski , dm-devel mailing list Cc: linfeilong , "liuzhiqiang (I)" List-Id: dm-devel.ids We check udev_device_get_syspath return value before dereference it. Signed-off-by: Lixiaokeng Signed-off-by: Zhiqiang Liu Signed-off-by: Linfeilong --- libmultipath/foreign/nvme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libmultipath/foreign/nvme.c b/libmultipath/foreign/nvme.c index a0668713..28e0d192 100644 --- a/libmultipath/foreign/nvme.c +++ b/libmultipath/foreign/nvme.c @@ -482,6 +482,7 @@ _find_path_by_syspath(struct nvme_map *map, const char *syspath) struct nvme_pathgroup *pg; char real[PATH_MAX]; const char *ppath; + const char *psyspath; int i; ppath = realpath(syspath, real); @@ -493,8 +494,8 @@ _find_path_by_syspath(struct nvme_map *map, const char *syspath) vector_foreach_slot(&map->pgvec, pg, i) { struct nvme_path *path = nvme_pg_to_path(pg); - if (!strcmp(ppath, - udev_device_get_syspath(path->udev))) + psyspath = udev_device_get_syspath(path->udev); + if (!psyspath && !strcmp(ppath, psyspath)) return path; } condlog(4, "%s: %s: %s not found", __func__, THIS, ppath); --