From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) by sourceware.org (Postfix) with ESMTPS id 74333385701E for ; Mon, 25 Jan 2021 17:36:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 74333385701E Received: by mail-qt1-x82e.google.com with SMTP id e17so10263226qto.3 for ; Mon, 25 Jan 2021 09:36:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:autocrypt:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=9MM+t6g1GIDtuUTN2TfyaLfAmtmtT5l5alMvRG8qTjc=; b=Cm51Si2sYhhyhFyOzb4i757mbAoDmPm01V5i9NLEHcZeXY5RXMk3Yf+DvuzOaUDjA6 3MAPCrzww/uX3havqz8se1bYqU+sHtM8HXb0S+XWLGj9+CdjTJiAs5BUP/8skW9932Wr ajU6MAnojO35q91tQMwKxTC++Fr065ElONsb/q3gaDOQ5rrPIQePYTbPxfsFsw1IrIb8 ilPGm4DEDRlhW8mUNVjSjQeQ1TZwUmcQ/o9yyG0K/eCauhmD7UlvHhhumSazeqasDbYT Ci483LA/Q13ftlkcfn9rNfcy2HPAYMicXm8d2YCl5A1NZpTazxH1NYwQ+w7/73T8yLm9 YalA== X-Gm-Message-State: AOAM533/HKmMqwLZX57uQyeOzcjyBRRGXlgHwRVimkhRhDdsDjE92MbT 94UUnvS6eGOKzO/evNz4Ek15MQ== X-Google-Smtp-Source: ABdhPJwPyhDKL5DYIvdK4MDvZ2K/KvKT2THQeKdGC0RDKBc+vUM9DmRlodTwNTHjxVsu1CIVpnbyBw== X-Received: by 2002:aed:32a3:: with SMTP id z32mr1474750qtd.297.1611596176038; Mon, 25 Jan 2021 09:36:16 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z26sm12334852qki.40.2021.01.25.09.36.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Jan 2021 09:36:15 -0800 (PST) To: Xiaoming Ni , aurelien@aurel32.net, eggert@cs.ucla.edu, joseph@codesourcery.com, zackw@panix.com, libc-alpha@sourceware.org Cc: wangle6@huawei.com References: <20210104040738.75761-1-nixiaoming@huawei.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Subject: Re: [PATCH v2] setrlimit/getrlimit: Use __nonnull to avoid null pointer Message-ID: Date: Mon, 25 Jan 2021 14:36:12 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210104040738.75761-1-nixiaoming@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.7 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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 25 Jan 2021 17:36:18 -0000 On 04/01/2021 01:07, Xiaoming Ni wrote: > Add __nonnull((2)) to the setrlimit()/getrlimit() function declaration > to avoid null pointer access. > > ----- > v2 > According to the suggestions of the Adhemerval Zanella and Zack Weinberg: > use __nonnull() to check null pointers in the compilation phase. > do not add pointer check code to setrlimit()/getrlimit(). > The validity of the "resource" parameter is checked in the syscall. > v1 > https://public-inbox.org/libc-alpha/20201230114131.47589-1-nixiaoming@huawei.com/ LGTM, ok for *2.34*. Reviewed-by: Adhemerval Zanella > ----- > --- > include/sys/resource.h | 4 ++-- > resource/sys/resource.h | 14 ++++++++------ > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/include/sys/resource.h b/include/sys/resource.h > index 2235b020fc..21d3908714 100644 > --- a/include/sys/resource.h > +++ b/include/sys/resource.h > @@ -126,13 +126,13 @@ libc_hidden_proto (__getrlimit64); > > /* Now define the internal interfaces. */ > extern int __getrlimit (enum __rlimit_resource __resource, > - struct rlimit *__rlimits); > + struct rlimit *__rlimits) __nonnull ((2)); > libc_hidden_proto (__getrlimit) > extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) > attribute_hidden; > > extern int __setrlimit (enum __rlimit_resource __resource, > - const struct rlimit *__rlimits); > + const struct rlimit *__rlimits) __nonnull ((2)); > libc_hidden_proto (__setrlimit); > > #if __TIMESIZE == 64 Ok. > diff --git a/resource/sys/resource.h b/resource/sys/resource.h > index 4edafb50d5..41aa42daa4 100644 > --- a/resource/sys/resource.h > +++ b/resource/sys/resource.h > @@ -48,18 +48,19 @@ typedef int __priority_which_t; > Returns 0 if successful, -1 if not (and sets errno). */ > #ifndef __USE_FILE_OFFSET64 > extern int getrlimit (__rlimit_resource_t __resource, > - struct rlimit *__rlimits) __THROW; > + struct rlimit *__rlimits) __THROW __nonnull ((2)); > #else > # ifdef __REDIRECT_NTH > extern int __REDIRECT_NTH (getrlimit, (__rlimit_resource_t __resource, > - struct rlimit *__rlimits), getrlimit64); > + struct rlimit *__rlimits), getrlimit64) > + __nonnull ((2)); > # else > # define getrlimit getrlimit64 > # endif > #endif > #ifdef __USE_LARGEFILE64 > extern int getrlimit64 (__rlimit_resource_t __resource, > - struct rlimit64 *__rlimits) __THROW; > + struct rlimit64 *__rlimits) __THROW __nonnull ((2)); > #endif > > /* Set the soft and hard limits for RESOURCE to *RLIMITS. Ok. > @@ -67,19 +68,20 @@ extern int getrlimit64 (__rlimit_resource_t __resource, > Return 0 if successful, -1 if not (and sets errno). */ > #ifndef __USE_FILE_OFFSET64 > extern int setrlimit (__rlimit_resource_t __resource, > - const struct rlimit *__rlimits) __THROW; > + const struct rlimit *__rlimits) __THROW __nonnull ((2)); > #else > # ifdef __REDIRECT_NTH > extern int __REDIRECT_NTH (setrlimit, (__rlimit_resource_t __resource, > const struct rlimit *__rlimits), > - setrlimit64); > + setrlimit64) __nonnull ((2)); > # else > # define setrlimit setrlimit64 > # endif > #endif > #ifdef __USE_LARGEFILE64 > extern int setrlimit64 (__rlimit_resource_t __resource, > - const struct rlimit64 *__rlimits) __THROW; > + const struct rlimit64 *__rlimits) __THROW > + __nonnull ((2)); > #endif > > /* Return resource usage information on process indicated by WHO > Ok.