From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 23 Nov 2021 14:05:58 +0000 (+0100)
Subject: tmpfiles: 'st' may have been used uninitialized
X-Git-Tag: archive/raspbian/247.3-7+rpi1+deb11u2^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffa9ce4564a02c3af278cd735c28001e376eb639;p=systemd.git

tmpfiles: 'st' may have been used uninitialized

(cherry picked from commit 160dadc0350c77d612aa9d5569f57d9bc84c3dca)
(cherry picked from commit 7563de501246dccf5a9ea229933481aa1e7bd5c9)
(cherry picked from commit f54b97b1d05052bfee824ecc03ae9f07f6c37be8)
(cherry picked from commit ab927db9a7698ee1eceae14ecef7ab43ee3f104e)

Gbp-Pq: Name tmpfiles-st-may-have-been-used-uninitialized.patch
---

diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index cf671c25..a78aa4f8 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -128,7 +128,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)