!18 [sync] PR-17: Fix leaking file descriptor to child processes

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504
This commit is contained in:
openeuler-ci-bot 2024-07-18 09:07:19 +00:00 committed by Gitee
commit dd52f9d967
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,28 @@
From c8e627016edd1440c8faf6f9b8f4092a83e01164 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 1 Nov 2023 14:32:43 +0000
Subject: [PATCH] inotify: Avoid leaking file descriptor to child processes
inotify_init creates a file descriptor which by default is not makes
with CLOEXEC. If the application using libusbmuxd spawns applications
this then leaks through.
---
src/libusbmuxd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
index d0cccd1..6f8197b 100644
--- a/src/libusbmuxd.c
+++ b/src/libusbmuxd.c
@@ -900,7 +900,7 @@ static int usbmuxd_listen_inotify()
return sfd;
sfd = -1;
- inot_fd = inotify_init ();
+ inot_fd = inotify_init1(IN_CLOEXEC);
if (inot_fd < 0) {
LIBUSBMUXD_DEBUG(1, "%s: Failed to setup inotify\n", __func__);
return -2;
--
2.27.0

View File

@ -1,11 +1,13 @@
Name: libusbmuxd
Version: 2.0.2
Release: 3
Release: 4
Summary: software protocol library and tools to communicate with iOS devices natively
License: LGPLv2+ and GPLv2+
URL: http://www.libimobiledevice.org/
Source0: https://github.com/libimobiledevice/%{name}/archive/%{version}.tar.gz
Patch1: 0001-inotify-Avoid-leaking-file-descriptor-to-child-proce.patch
BuildRequires: gcc libplist-devel >= 2.2.0 autoconf automake libtool
Provides: %{name}-utils
Obsoletes: %{name}-utils
@ -25,7 +27,7 @@ Obsoletes: usbmuxd-devel < 1.0.9
provide head files or other files to support for development with %{name}.
%prep
%setup -q
%autosetup -n %{name}-%{version} -p1
NOCONFIGURE=1 ./autogen.sh
%build
@ -59,6 +61,9 @@ make check
%{_libdir}/libusbmuxd-2.0.so
%changelog
* Mon Jul 8 2024 kouwenqi <kouwenqi@kylinos.cn> - 2.0.2-4
- Fix leaking file descriptor to child processes
* Mon Apr 18 2022 Chenxi Mao <chenxi.mao@suse.com> - 2.0.2-3
- Remove self-dependency