From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id B34981F454 for ; Fri, 8 Nov 2019 16:56:57 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; q=dns; s=default; b=wySo thEwmOQw+4rPSlMiy63g6QHFAwxCmvSN1ovxur3A6igdgCwxArcykklbfAUEY1Y5 +uEXQYMMaf9JwXwXtIzYIg1L/mUBrj1WHsC3jH6+XmTsnDr7S/cQIpl+WYqiAJiU WiTZuXz+UUgp+ZfvcIJbZS1KzlGhZDB7O5CcPMc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; s=default; bh=F/UxL4K/+O CBUIZvnbdymZjQc3U=; b=RYBS7H5xsZ3/z7mz4gJwv/D1HOHUZDLTvLbVAeFp1V azxvE5nfVaxVexy2qKZLbe/HV6TPwuxZyRP/qakhiMi4ajTCAAiMkwid9iQAVJOO oYAaWxyf7UBjqfLawyRp+F2bo+u9weBHn5/toaySaxmLBzyRYrNLtVBlEwVXkVh4 s= Received: (qmail 59333 invoked by alias); 8 Nov 2019 16:56:55 -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 Received: (qmail 59325 invoked by uid 89); 8 Nov 2019 16:56:55 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-lj1-f196.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wS9+Aw2GlkJrPQ6ZuTfYrHqzoAy0ax9hy3FA9/gVnDM=; b=anFTbi7axQSBDG6aEoOQMpUKzyU3/QtR4+EAJJbZbxxTvSZn53unM5FqSyz5FnTThf AAof/woEiVTZgdG0YiVZllqD/jc9U+ywWLsoKgUoaTW0m3uJ3AGSKeHxiWbUzTIam55E FKiN9jj83yYQ2GBWapSRZ/W1myiDXWwmT32SWsXcxi51GQO2k5ic5PyHL3bOJcBc0Nfd ClfeaGA9HWp3u9XhCO0qOmW8364VfGMICGIsp7GzTKAc0KYV5hMuTFNTPAoWNqgRILaZ 7HawiFsDSX5yNVKzrVQ1hpBs2CpR9+jeFHllL9E4VG8ANFqaaLrJ34yMPfN4MUhFeHcR mm9g== MIME-Version: 1.0 References: <20191108153344.10949-1-lukma@denx.de> <20191108153344.10949-2-lukma@denx.de> In-Reply-To: <20191108153344.10949-2-lukma@denx.de> From: Alistair Francis Date: Fri, 8 Nov 2019 08:56:25 -0800 Message-ID: Subject: Re: [PATCH 2/2] linux: clock_settime: Return proper value when passing NULL pointer To: Lukasz Majewski Cc: Joseph Myers , Paul Eggert , Alistair Francis , GNU C Library , Adhemerval Zanella , Florian Weimer , Florian Weimer , Zack Weinberg , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" On Fri, Nov 8, 2019 at 7:34 AM Lukasz Majewski wrote: > > When in __clock_settime function (__TIMESIZE != 64) the const struct > timespec's *tp pointer is NULL, the Linux kernel syscall returns > -EFAULT. > Without this patch the glibc crashes (when dereferencing NULL pointer) > as the Linux kernel syscall is not reached at all. > > There is no need for such check in the __clock_settime64, as this > pointer either goes directly to Linux kernel or the pointer to local > copy is used (ts64). Reviewed-by: Alistair Francis Alistair > --- > sysdeps/unix/sysv/linux/clock_settime.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c > index 6706dbb31f..e358a18998 100644 > --- a/sysdeps/unix/sysv/linux/clock_settime.c > +++ b/sysdeps/unix/sysv/linux/clock_settime.c > @@ -51,7 +51,14 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp) > int > __clock_settime (clockid_t clock_id, const struct timespec *tp) > { > - struct __timespec64 ts64 = valid_timespec_to_timespec64 (*tp); > + struct __timespec64 ts64; > + > + if (tp == NULL) > + { > + __set_errno (EFAULT); > + return -1; > + } > + ts64 = valid_timespec_to_timespec64 (*tp); > > return __clock_settime64 (clock_id, &ts64); > } > -- > 2.20.1 >