32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 7563de501246dccf5a9ea229933481aa1e7bd5c9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 23 Nov 2021 15:05:58 +0100
|
|
Subject: [PATCH] tmpfiles: 'st' may have been used uninitialized
|
|
|
|
(cherry picked from commit 160dadc0350c77d612aa9d5569f57d9bc84c3dca)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/7563de501246dccf5a9ea229933481aa1e7bd5c9
|
|
---
|
|
src/shared/rm-rf.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c
|
|
index 5ef7c662dd..19f37e0f19 100644
|
|
--- a/src/shared/rm-rf.c
|
|
+++ b/src/shared/rm-rf.c
|
|
@@ -129,7 +129,9 @@ static int rm_rf_children_inner(
|
|
assert(fd >= 0);
|
|
assert(fname);
|
|
|
|
- if (is_dir < 0 || (is_dir > 0 && (root_dev || (flags & REMOVE_SUBVOLUME)))) {
|
|
+ if (is_dir < 0 ||
|
|
+ root_dev ||
|
|
+ (is_dir > 0 && (root_dev || (flags & REMOVE_SUBVOLUME)))) {
|
|
|
|
r = fstatat_harder(fd, fname, &st, AT_SYMLINK_NOFOLLOW, flags);
|
|
if (r < 0)
|
|
--
|
|
2.33.0
|
|
|