From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id 633343858438 for ; Tue, 18 Apr 2023 12:05:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 633343858438 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-187edc01fa3so196870fac.3 for ; Tue, 18 Apr 2023 05:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681819536; x=1684411536; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=DeNZsSBkEx0aX5tAxsB9Yjf86xB/9jMe9nbjQPedW+Q=; b=N83T6Xyy0yCzn6F06sI1pGTZxWcOrRPaIIDX/jrxwEiwxoRw6QQazcvdeBzcE3CrRN 1YoeCpObnXLAt2xq3SzhPjdjHcz+NgYJHLZBM0cmM5lywTLPlHGFSyINdpsVqX/RRcWm kw1iY32Es5gGmWj2DDSESNt6M6w7GqWrQ4REdv6vnwSh6LWnGyJiRD7lZkK9nl79uwhm +2Xh+QIDtAKjGdok9pYgFqb7XrG4rxc3bh8meZhIRPobV10qPZWs5x8rJhKmDrjNFWwM w5LT8FuOoSgmkuWFjx1VO1WIuNaSezDWKahWRrpUq0G5DAIEOpsSG+LBSZf9f0uB0zgT olyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681819536; x=1684411536; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DeNZsSBkEx0aX5tAxsB9Yjf86xB/9jMe9nbjQPedW+Q=; b=TxzTZCmo/46APBim7ergekAiiEUm3mMxEROdHCwVgRPAY/W8VORKIZy8F+SRwOlstO Mlcfv5TudcbOq/aU7gsmo2DhaWObk10+0Ga72Ndtb5sISslztFUxuCLbiavhvzhpMqSW c6MfLCTH7BhjuzWC/nnm+HR4TfOW0dVny9pbzqfn12tjEhxA7wd6dLdJqw7IBfHjAKHU x7hVf0LkpIO9/kvDFaL8IZ95YEhcflwic3IQcwpubCyBMHW0EWR6LgfekBlz1+zEWJJO JM2mf/0Sxzwoi5BOOqCU0YHQcY55WVIa/UF0vnVn10K2dYjRABSM0vuoiPVprH++pfQv 7xqQ== X-Gm-Message-State: AAQBX9ffv4K0SuKbD2gwLYwYpK15iHTfpxBkV5lNjaTQJsq2W3DU4+2T SDpz0Guvskr706h+rbIwQEuITngQSXRwznQS20ihuQ== X-Google-Smtp-Source: AKy350b213D+tYfItK1DUG2OttmxLoHfCdrTPL84qanzgI/Z6sjO16zF+z5HhiDiVIJ87qHsUpSEog== X-Received: by 2002:a05:6870:56a6:b0:187:8bf2:3b2a with SMTP id p38-20020a05687056a600b001878bf23b2amr1035584oao.57.1681819536265; Tue, 18 Apr 2023 05:05:36 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:333:6c1b:2ac3:fde1:4edf? ([2804:1b3:a7c3:333:6c1b:2ac3:fde1:4edf]) by smtp.gmail.com with ESMTPSA id v13-20020a9d4e8d000000b006a5ef5db2f6sm1429273otk.27.2023.04.18.05.05.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Apr 2023 05:05:35 -0700 (PDT) Message-ID: <0cc303ed-c315-e1f2-2b7f-3ac54e64530c@linaro.org> Date: Tue, 18 Apr 2023 09:05:33 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [RFC PATCH 2/5] Use O_CLOEXEC in more places Content-Language: en-US To: Sergey Bugaev , libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault References: <20230417225857.2006561-1-bugaevc@gmail.com> <20230417225857.2006561-3-bugaevc@gmail.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20230417225857.2006561-3-bugaevc@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 17/04/23 19:58, Sergey Bugaev via Libc-alpha wrote: > When opening a temporary file without O_CLOEXEC we risk leaking the > file descriptor if another thread calls (fork and then) exec while we > have the fd open. Fix this by consistently passing O_CLOEXEC everywhere > where we open a file for internal use (and not to return it to the user, > in which case the API defines whether or not the close-on-exec flag > shall be set on the returned fd). > > Signed-off-by: Sergey Bugaev This is BZ#15722 [1], so I think you should advertise on subject. Patch LGMT, thanks. Reviewed-by: Adhemerval Zanella [1] https://sourceware.org/bugzilla/show_bug.cgi?id=15722 > --- > catgets/open_catalog.c | 4 ++-- > elf/dl-profile.c | 3 ++- > gmon/gmon.c | 7 ++++--- > iconv/gconv_cache.c | 2 +- > login/utmp_file.c | 2 +- > sysdeps/pthread/sem_open.c | 9 ++++++--- > 6 files changed, 16 insertions(+), 11 deletions(-) > > diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c > index 242709db..46c444d2 100644 > --- a/catgets/open_catalog.c > +++ b/catgets/open_catalog.c > @@ -49,7 +49,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, > char *buf = NULL; > > if (strchr (cat_name, '/') != NULL || nlspath == NULL) > - fd = __open_nocancel (cat_name, O_RDONLY); > + fd = __open_nocancel (cat_name, O_RDONLY | O_CLOEXEC); > else > { > const char *run_nlspath = nlspath; > @@ -177,7 +177,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, > > if (bufact != 0) > { > - fd = __open_nocancel (buf, O_RDONLY); > + fd = __open_nocancel (buf, O_RDONLY | O_CLOEXEC); > if (fd >= 0) > break; > } > diff --git a/elf/dl-profile.c b/elf/dl-profile.c > index 2ecac05f..d8345da2 100644 > --- a/elf/dl-profile.c > +++ b/elf/dl-profile.c > @@ -324,7 +324,8 @@ _dl_start_profile (void) > *cp++ = '/'; > __stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile"); > > - fd = __open64_nocancel (filename, O_RDWR|O_CREAT|O_NOFOLLOW, DEFFILEMODE); > + fd = __open64_nocancel (filename, O_RDWR | O_CREAT | O_NOFOLLOW > + | O_CLOEXEC, DEFFILEMODE); > if (fd == -1) > { > char buf[400]; > diff --git a/gmon/gmon.c b/gmon/gmon.c > index bc0e2943..6439ed1c 100644 > --- a/gmon/gmon.c > +++ b/gmon/gmon.c > @@ -384,13 +384,14 @@ write_gmon (void) > size_t len = strlen (env); > char buf[len + 20]; > __snprintf (buf, sizeof (buf), "%s.%u", env, __getpid ()); > - fd = __open_nocancel (buf, O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW, 0666); > + fd = __open_nocancel (buf, O_CREAT | O_TRUNC | O_WRONLY | O_NOFOLLOW > + | O_CLOEXEC, 0666); > } > > if (fd == -1) > { > - fd = __open_nocancel ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW, > - 0666); > + fd = __open_nocancel ("gmon.out", O_CREAT | O_TRUNC | O_WRONLY > + | O_NOFOLLOW | O_CLOEXEC, 0666); > if (fd < 0) > { > char buf[300]; > diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c > index f2100ca8..87136e24 100644 > --- a/iconv/gconv_cache.c > +++ b/iconv/gconv_cache.c > @@ -58,7 +58,7 @@ __gconv_load_cache (void) > return -1; > > /* See whether the cache file exists. */ > - fd = __open_nocancel (GCONV_MODULES_CACHE, O_RDONLY, 0); > + fd = __open_nocancel (GCONV_MODULES_CACHE, O_RDONLY | O_CLOEXEC, 0); > if (__builtin_expect (fd, 0) == -1) > /* Not available. */ > return -1; > diff --git a/login/utmp_file.c b/login/utmp_file.c > index 53494595..1ef07821 100644 > --- a/login/utmp_file.c > +++ b/login/utmp_file.c > @@ -463,7 +463,7 @@ __libc_updwtmp (const char *file, const struct utmp *utmp) > int fd; > > /* Open WTMP file. */ > - fd = __open_nocancel (file, O_WRONLY | O_LARGEFILE); > + fd = __open_nocancel (file, O_WRONLY | O_LARGEFILE | O_CLOEXEC); > if (fd < 0) > return -1; > > diff --git a/sysdeps/pthread/sem_open.c b/sysdeps/pthread/sem_open.c > index 2d32a135..e5db929d 100644 > --- a/sysdeps/pthread/sem_open.c > +++ b/sysdeps/pthread/sem_open.c > @@ -36,6 +36,7 @@ sem_t * > __sem_open (const char *name, int oflag, ...) > { > int fd; > + int open_flags; > sem_t *result; > > /* Check that shared futexes are supported. */ > @@ -64,9 +65,10 @@ __sem_open (const char *name, int oflag, ...) > /* If the semaphore object has to exist simply open it. */ > if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0) > { > + open_flags = O_RDWR | O_NOFOLLOW | O_CLOEXEC; > + open_flags |= (oflag & ~(O_CREAT|O_ACCMODE)); > try_again: > - fd = __open (dirname.name, > - (oflag & ~(O_CREAT|O_ACCMODE)) | O_NOFOLLOW | O_RDWR); > + fd = __open (dirname.name, open_flags); > > if (fd == -1) > { > @@ -133,7 +135,8 @@ __sem_open (const char *name, int oflag, ...) > } > > /* Open the file. Make sure we do not overwrite anything. */ > - fd = __open (tmpfname, O_RDWR | O_CREAT | O_EXCL, mode); > + open_flags = O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC; > + fd = __open (tmpfname, open_flags, mode); > if (fd == -1) > { > if (errno == EEXIST)