37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From c8448495049b22e6ee30c84c377e61f65d886ca3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karel Zak <kzak@redhat.com>
|
||
|
|
Date: Mon, 6 Nov 2023 11:40:27 +0100
|
||
|
|
Subject: [PATCH] libmount: fix possible NULL dereference [coverity scan]
|
||
|
|
|
||
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||
|
|
Reference:https://github.com/util-linux/util-linux/commit/c8448495049b22e6ee30c84c377e61f65d886ca3
|
||
|
|
Conflict:NA
|
||
|
|
---
|
||
|
|
libmount/src/tab.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
|
||
|
|
index 5c2d5c868..972566467 100644
|
||
|
|
--- a/libmount/src/tab.c
|
||
|
|
+++ b/libmount/src/tab.c
|
||
|
|
@@ -660,7 +660,7 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
|
||
|
|
{
|
||
|
|
struct libmnt_fs *fs, *chfs = NULL;
|
||
|
|
int parent_id, lastchld_id = 0, chld_id = 0;
|
||
|
|
- int direction = mnt_iter_get_direction(itr);
|
||
|
|
+ int direction;
|
||
|
|
|
||
|
|
if (!tb || !itr || !parent || !is_mountinfo(tb))
|
||
|
|
return -EINVAL;
|
||
|
|
@@ -668,6 +668,7 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
|
||
|
|
DBG(TAB, ul_debugobj(tb, "lookup next child of '%s'",
|
||
|
|
mnt_fs_get_target(parent)));
|
||
|
|
parent_id = mnt_fs_get_id(parent);
|
||
|
|
+ direction = mnt_iter_get_direction(itr);
|
||
|
|
|
||
|
|
/* get ID of the previously returned child */
|
||
|
|
if (itr->head && itr->p != itr->head) {
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|