From: Yu Watanabe Date: Thu, 22 Jun 2023 07:13:29 +0000 (+0900) Subject: copy: propagate error in fd_copy_directory() X-Git-Tag: v254-rc1~119^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b62e2891ef2d2da46f98717a539085b3250f82ff;p=thirdparty%2Fsystemd.git copy: propagate error in fd_copy_directory() Follow-up for 01428141ba42a06d22f2c0e0df26049e700f4098. Fixes CID#1513190. --- diff --git a/src/shared/copy.c b/src/shared/copy.c index 9d3db2d7716..241a2d112b7 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -1084,6 +1084,9 @@ finish: return -errno; } + if (r < 0) + return r; + return copy_flags & COPY_LOCK_BSD ? TAKE_FD(fdt) : 0; }