From patchwork Sun Feb 9 20:20:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 37817 X-Patchwork-Delegate: carlos@redhat.com Received: (qmail 22851 invoked by alias); 9 Feb 2020 20:20:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22750 invoked by uid 89); 9 Feb 2020 20:20:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581279638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lgOOgkrebi2gLHHt8YBsgLyf2ADFgUrzy4YaPuXxr/c=; b=balaWtzHKnQhEIcfdf0guduioQQES3fpRUKSQ3N4yY5auQPU0Tj4YLq+0IO5PSA5EvX0Fa 9HtLrBcNMBLjTGvkRSoQ5pj9RV8I0Wd6/K67+sKfj6pWSI7HF+mBUrVy8870RKWMimYc+M lAg+ReQf5zU9BOiF2RAUvAezKfI+VpM= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 13/26] Linux: getrandom syscall number is always available In-Reply-To: References: X-From-Line: ac0ba6febb01f1f794d2067d80906539f9a10b9d Mon Sep 17 00:00:00 2001 Message-Id: Date: Sun, 09 Feb 2020 21:20:32 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Due to the built-in tables, __NR_getrandom is always defined. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/getentropy.c | 9 --------- sysdeps/unix/sysv/linux/getrandom.c | 13 ------------- 2 files changed, 22 deletions(-) diff --git a/sysdeps/unix/sysv/linux/getentropy.c b/sysdeps/unix/sysv/linux/getentropy.c index 5d0b8d10c1..2f3a4e4692 100644 --- a/sysdeps/unix/sysv/linux/getentropy.c +++ b/sysdeps/unix/sysv/linux/getentropy.c @@ -21,7 +21,6 @@ #include #include -#ifdef __NR_getrandom /* Write LENGTH bytes of randomness starting at BUFFER. Return 0 on success and -1 on failure. */ int @@ -63,11 +62,3 @@ getentropy (void *buffer, size_t length) } return 0; } -#else -int -getentropy (void *buffer, size_t length) -{ - __set_errno (ENOSYS); - return -1; -} -#endif diff --git a/sysdeps/unix/sysv/linux/getrandom.c b/sysdeps/unix/sysv/linux/getrandom.c index 309beadf72..63b8d36bf4 100644 --- a/sysdeps/unix/sysv/linux/getrandom.c +++ b/sysdeps/unix/sysv/linux/getrandom.c @@ -21,7 +21,6 @@ #include #include -#ifdef __NR_getrandom /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ ssize_t @@ -29,17 +28,5 @@ __getrandom (void *buffer, size_t length, unsigned int flags) { return SYSCALL_CANCEL (getrandom, buffer, length, flags); } -#else -/* Always provide a definition, even if the kernel headers lack the - system call number. */ -ssize_t -__getrandom (void *buffer, size_t length, unsigned int flags) -{ - /* Ideally, we would add a cancellation point here, but we currently - cannot do so inside libc. */ - __set_errno (ENOSYS); - return -1; -} -#endif libc_hidden_def (__getrandom) weak_alias (__getrandom, getrandom)