From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5B7853858D39 for ; Thu, 10 Mar 2022 22:14:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5B7853858D39 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-Olmq_32vNmywo9KtgKy-XQ-1; Thu, 10 Mar 2022 17:14:41 -0500 X-MC-Unique: Olmq_32vNmywo9KtgKy-XQ-1 Received: by mail-qt1-f198.google.com with SMTP id r7-20020a05622a034700b002e06ebbc866so5180108qtw.1 for ; Thu, 10 Mar 2022 14:14:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:cc:from:organization:in-reply-to :content-transfer-encoding; bh=e7VBO6ZOPLSUPm0LJ+HmnuWtosOi3IjhYfjhOi8xNCM=; b=CObRhDlw75f8rk9IhAUVAobv0VJ0TwWpwnhmuSiNY/pY+51Bjzg4jbbQu3NVdtDNXZ OviaY4TIHEvdACI81gBJ8u3qdamYB/WB60ZwtuxuDUydYxyUtKZav5/opDRhmLZ4oTV8 RPhQV35ukdfovcFmLWi7Mw291fxra81z2c8wsvHfqRMz022rMxCXSzqQ2d7feT244coh TD5i9vs51KEQlZAI5SSI/vXHCFOTp652y3TpcpcI0lJsrsxLxJUmyx/Fm5vRh1lqOpeJ 9AisJJb9GHtQEQ07Lllz5JRG3D5bLlQLxSAl55VBH/CDEk4l+72NtT3bNlO90STs8nai tDZw== X-Gm-Message-State: AOAM5319kQbZ8Wk8apq8glPvzESADSsk+6E0mjGA+Q7kb2rdi2gG4CX6 e4vSrpa+c7KGROC7cStEFE5daJStXqolXsaarBUgiL3wKARQU/2ZxEfJGYtsjahP9zu4QW2u8Ml gDQpcBkgK+/kJTQ5zaPuv X-Received: by 2002:ac8:57c7:0:b0:2e0:b946:e954 with SMTP id w7-20020ac857c7000000b002e0b946e954mr5942657qta.387.1646950480553; Thu, 10 Mar 2022 14:14:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzH5HQ6TtkC7tiKUB8dbCnHZv0iBx83kN9FL6K6LC8C/3Xg2W+Q+NaVhflo16tRRAOl1AI0RQ== X-Received: by 2002:ac8:57c7:0:b0:2e0:b946:e954 with SMTP id w7-20020ac857c7000000b002e0b946e954mr5942645qta.387.1646950480288; Thu, 10 Mar 2022 14:14:40 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id r64-20020a37a843000000b0067b0cf40b18sm2885423qke.69.2022.03.10.14.14.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Mar 2022 14:14:39 -0800 (PST) Message-ID: Date: Thu, 10 Mar 2022 17:14:38 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [Patch] Add access function attributes to grp and shadow headers To: Steve Grubb , libc-alpha@sourceware.org References: <2822403.e9J7NaK4W3@x2> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <2822403.e9J7NaK4W3@x2> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2022 22:14:53 -0000 On 3/10/22 13:08, Steve Grubb via Libc-alpha wrote: > This patch adds access function attributes to the re-entrant functions > in grp.h and shadow headers. Steve, Thanks for the patch! This fails CI/CD https://patchwork.sourceware.org/project/glibc/patch/2822403.e9J7NaK4W3@x2/ https://www.delorie.com/trybots/32bit/7821/make.tail.txt If you need help with testing please feel free to reach out. > --- > grp/grp.h | 12 ++++++++---- > gshadow/gshadow.h | 12 ++++++++---- > shadow/shadow.h | 12 ++++++++---- > 3 files changed, 24 insertions(+), 12 deletions(-) > --- > diff -urp glibc-2.35.9000-111-g2bbc694df2.orig/grp/grp.h glibc-2.35.9000-111-g2bbc694df2/grp/grp.h > --- glibc-2.35.9000-111-g2bbc694df2.orig/grp/grp.h 2022-02-28 10:47:38.000000000 -0500 > +++ glibc-2.35.9000-111-g2bbc694df2/grp/grp.h 2022-03-10 11:56:18.733069367 -0500 > @@ -130,7 +130,8 @@ extern struct group *getgrnam (const cha > # ifdef __USE_GNU > extern int getgrent_r (struct group *__restrict __resultbuf, > char *__restrict __buffer, size_t __buflen, > - struct group **__restrict __result); > + struct group **__restrict __result) > + __attr_access ((__write_only__, 2, 3)); > # endif > > /* Search for an entry with a matching group ID. > @@ -139,7 +140,8 @@ extern int getgrent_r (struct group *__r > marked with __THROW. */ > extern int getgrgid_r (__gid_t __gid, struct group *__restrict __resultbuf, > char *__restrict __buffer, size_t __buflen, > - struct group **__restrict __result); > + struct group **__restrict __result) > + __attr_access ((__write_only__, 3, 4)); > > /* Search for an entry with a matching group name. > > @@ -148,7 +150,8 @@ extern int getgrgid_r (__gid_t __gid, st > extern int getgrnam_r (const char *__restrict __name, > struct group *__restrict __resultbuf, > char *__restrict __buffer, size_t __buflen, > - struct group **__restrict __result); > + struct group **__restrict __result) > + __attr_access ((__write_only__, 3, 4)); > > # ifdef __USE_MISC > /* Read a group entry from STREAM. This function is not standardized > @@ -161,7 +164,8 @@ extern int getgrnam_r (const char *__res > extern int fgetgrent_r (FILE *__restrict __stream, > struct group *__restrict __resultbuf, > char *__restrict __buffer, size_t __buflen, > - struct group **__restrict __result); > + struct group **__restrict __result) > + __attr_access ((__write_only__, 3, 4)); > # endif > > #endif /* POSIX or reentrant */ > diff -urp glibc-2.35.9000-111-g2bbc694df2.orig/gshadow/gshadow.h glibc-2.35.9000-111-g2bbc694df2/gshadow/gshadow.h > --- glibc-2.35.9000-111-g2bbc694df2.orig/gshadow/gshadow.h 2022-02-28 10:47:38.000000000 -0500 > +++ glibc-2.35.9000-111-g2bbc694df2/gshadow/gshadow.h 2022-03-10 12:10:00.417407391 -0500 > @@ -108,19 +108,23 @@ extern int putsgent (const struct sgrp * > or due to the implementation they are cancellation points and > therefore not marked with __THROW. */ > extern int getsgent_r (struct sgrp *__result_buf, char *__buffer, > - size_t __buflen, struct sgrp **__result); > + size_t __buflen, struct sgrp **__result) > + __attr_access ((__write_only__, 2, 3)); > > extern int getsgnam_r (const char *__name, struct sgrp *__result_buf, > char *__buffer, size_t __buflen, > - struct sgrp **__result); > + struct sgrp **__result) > + __attr_access ((__write_only__, 3, 4)); > > extern int sgetsgent_r (const char *__string, struct sgrp *__result_buf, > char *__buffer, size_t __buflen, > - struct sgrp **__result); > + struct sgrp **__result) > + __attr_access ((__write_only__, 3, 4)); > > extern int fgetsgent_r (FILE *__stream, struct sgrp *__result_buf, > char *__buffer, size_t __buflen, > - struct sgrp **__result); > + struct sgrp **__result) > + __attr_access ((__write_only__, 3, 4)); > #endif /* misc */ > > __END_DECLS > diff -urp glibc-2.35.9000-111-g2bbc694df2.orig/shadow/shadow.h glibc-2.35.9000-111-g2bbc694df2/shadow/shadow.h > --- glibc-2.35.9000-111-g2bbc694df2.orig/shadow/shadow.h 2022-02-28 10:47:38.000000000 -0500 > +++ glibc-2.35.9000-111-g2bbc694df2/shadow/shadow.h 2022-03-10 11:59:17.647530571 -0500 > @@ -122,19 +122,23 @@ extern int putspent (const struct spwd * > or due to the implementation they are cancellation points and > therefore not marked with __THROW. */ > extern int getspent_r (struct spwd *__result_buf, char *__buffer, > - size_t __buflen, struct spwd **__result); > + size_t __buflen, struct spwd **__result) > + __attr_access ((__write_only__, 2, 3)); > > extern int getspnam_r (const char *__name, struct spwd *__result_buf, > char *__buffer, size_t __buflen, > - struct spwd **__result); > + struct spwd **__result) > + __attr_access ((__write_only__, 3, 4)); > > extern int sgetspent_r (const char *__string, struct spwd *__result_buf, > char *__buffer, size_t __buflen, > - struct spwd **__result); > + struct spwd **__result) > + __attr_access ((__write_only__, 3, 4); > > extern int fgetspent_r (FILE *__stream, struct spwd *__result_buf, > char *__buffer, size_t __buflen, > - struct spwd **__result); > + struct spwd **__result) > + __attr_access ((__write_only__, 3, 4); > #endif /* misc */ > > > > > -- Cheers, Carlos.