From c8de3762ec6de66884be0c5313d3872f869c4ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 23 Nov 2021 15:05:58 +0100 Subject: [PATCH 6/9] tmpfiles: 'st' may have been used uninitialized Conflict:modify file in basic instead of shared Reference:https://github.com/systemd/systemd/commit/160dadc0350c77d612aa9d5569f57d9bc84c3dca (cherry picked from commit 160dadc0350c77d612aa9d5569f57d9bc84c3dca) (cherry picked from commit 7563de501246dccf5a9ea229933481aa1e7bd5c9) (cherry picked from commit f54b97b1d05052bfee824ecc03ae9f07f6c37be8) --- src/basic/rm-rf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c index 4e46654..ad1f286 100644 --- a/src/basic/rm-rf.c +++ b/src/basic/rm-rf.c @@ -130,7 +130,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.23.0