Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2253241ybg; Sun, 27 Oct 2019 14:27:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1U0gN0E335MfYDQFHE2v0iDR7FZD3gmX4l3/DDU1d0JZZTSrkCGux1BQ+L8ytgF1uC8F/ X-Received: by 2002:a17:906:edb7:: with SMTP id sa23mr13617657ejb.327.1572211653952; Sun, 27 Oct 2019 14:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211653; cv=none; d=google.com; s=arc-20160816; b=hcfWKPCpYISksxa4eg4LxJNICox4+A0rVgCCbN2V0WA186UjkTPKjBRQgZ6k1sHD8v LHNydBhKgtYbF7tjXtLisdjqYH7VDn4QCoqMKuFYD4saAd+DyHiclAZM/SFABXoGLeNK 7nrA5dC5nObxUG+1Ey7OWil7W/1wM4mprRxb3kt+VmrlLhU26g+4Q5aseFr7+f7Iz54a XRoeex4KJIWXuO7GjR7hwsAjGgrIYRpe5jvWZmpD+LU89wgqN94QfzcLHUZJCM2ncsxp 3sK/OhyQCDBNVT8K/W+v8QuF8iD8/UuNNtpWPv+qV99hAF1quZpwoMrpzBu6fXv9tUm0 vP7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uRXMOFvNRJYgfs+0rDSBA2xyr/77cj0qyL80WEShlI0=; b=Rq0ttLNf4vSw4Fc9HTwYrZUhGGITbvQiLkwo8lcEmUYR9TPVXDrRiDhrcQNth3Vjzp zGcJwTVXEn1qYtR6GBZAW5dUn33wi2I4nABZRa45eLwV1RpsvxA15mM0drrNHz/KXv1P mzFkNt3419CzUIg7o++U5fmS9MsRxWP6R/ND89LYOUivJlda3iZRRCEqp48PGWo4VzeT XDb1jDcsqc4i+2bkdzQtxS6Q7rVUONiIb6/MGMe1zlqm6AxC+bWucmbTyJEe+KHDtz8B vZGwQZXape0LNEC26P7njxBgoS69+gOsxPBFpqgCCm/MWVIoM7ltO0t2uBxovW8KyvcC NWqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gJao6HGx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b28si6134389edc.400.2019.10.27.14.27.10; Sun, 27 Oct 2019 14:27:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gJao6HGx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732508AbfJ0VYZ (ORCPT + 99 others); Sun, 27 Oct 2019 17:24:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732497AbfJ0VYX (ORCPT ); Sun, 27 Oct 2019 17:24:23 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 341E421783; Sun, 27 Oct 2019 21:24:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211462; bh=pi7SjfMWiAbPd0beiEK8YvY0VIwoPcp6zYc9P+qpbmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJao6HGx1lnM2/7oji2M9S3yr6vNQai4J4eOo/jVktFx2p9VQVRp2U49vtJ9VVYON TPwqgJMF/RrpXRXR4UdGMZBieyxk8bFDstLuTqvXknn4JqqeSD8H5W7BHBp3HrUZ47 +WhWFwdsUDXhqks7MX+DuLpDDOgQ+2iR+GI5WFTY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Schwab , Thomas Gleixner , Christophe Leroy Subject: [PATCH 5.3 160/197] lib/vdso: Make clock_getres() POSIX compliant again Date: Sun, 27 Oct 2019 22:01:18 +0100 Message-Id: <20191027203400.319408005@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner commit 1638b8f096ca165965189b9626564c933c79fe63 upstream. A recent commit removed the NULL pointer check from the clock_getres() implementation causing a test case to fault. POSIX requires an explicit NULL pointer check for clock_getres() aside of the validity check of the clock_id argument for obscure reasons. Add it back for both 32bit and 64bit. Note, this is only a partial revert of the offending commit which does not bring back the broken fallback invocation in the the 32bit compat implementations of clock_getres() and clock_gettime(). Fixes: a9446a906f52 ("lib/vdso/32: Remove inconsistent NULL pointer checks") Reported-by: Andreas Schwab Signed-off-by: Thomas Gleixner Tested-by: Christophe Leroy Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1910211202260.1904@nanos.tec.linutronix.de Signed-off-by: Greg Kroah-Hartman --- lib/vdso/gettimeofday.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/lib/vdso/gettimeofday.c +++ b/lib/vdso/gettimeofday.c @@ -214,9 +214,10 @@ int __cvdso_clock_getres_common(clockid_ return -1; } - res->tv_sec = 0; - res->tv_nsec = ns; - + if (likely(res)) { + res->tv_sec = 0; + res->tv_nsec = ns; + } return 0; } @@ -245,7 +246,7 @@ __cvdso_clock_getres_time32(clockid_t cl ret = clock_getres_fallback(clock, &ts); #endif - if (likely(!ret)) { + if (likely(!ret && res)) { res->tv_sec = ts.tv_sec; res->tv_nsec = ts.tv_nsec; }