From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A30DC43603 for ; Wed, 11 Dec 2019 16:12:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 544D321556 for ; Wed, 11 Dec 2019 16:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576080779; bh=fqApEpiJswPrQQE2UddJFG1LKaOvkhQp23n/8LhV2U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vxfvLNkeOFVOBEflQczFS32LuVKE97Qt5PrKIxGemsbL74wc6Jsu7+/MHMs7Ku1eg /UNy/B7q5dVt7Ea36hkYL5LuQ/dd0OaAbv92fsHo2/6qjRAD9/uWZ9XwHiwrkQJXPv hfFd9dMmGiglTXdKyvDvi39IUO9VT3tq7VQp2rKc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731057AbfLKQM5 (ORCPT ); Wed, 11 Dec 2019 11:12:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:56490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730451AbfLKPIr (ORCPT ); Wed, 11 Dec 2019 10:08:47 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 1BD2B20663; Wed, 11 Dec 2019 15:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076926; bh=fqApEpiJswPrQQE2UddJFG1LKaOvkhQp23n/8LhV2U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sutW1yQoZX1l1rFV1UG6hJKCIVBR4BkpUbezUSgA1u0nTZFQb/xLCmKTkQII0/Z0W 08mbc3bNLIK0WXI0AI1Xf9l7WwJTlsDKWgQVRu0Yf+zsB+UaySep1mLCtP2g6qO/Js FVwU2y6T9fkl/RYebARS4WtMo5A+0Bg9eOP8NsDo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , Dmitry Safonov , Thomas Gleixner Subject: [PATCH 5.4 07/92] time: Zero the upper 32-bits in __kernel_timespec on 32-bit Date: Wed, 11 Dec 2019 16:04:58 +0100 Message-Id: <20191211150223.554327134@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.977775294@linuxfoundation.org> References: <20191211150221.977775294@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: Dmitry Safonov commit 7b8474466ed97be458c825f34a85f2c2b84c3f95 upstream. On compat interfaces, the high order bits of nanoseconds should be zeroed out. This is because the application code or the libc do not guarantee zeroing of these. If used without zeroing, kernel might be at risk of using timespec values incorrectly. Originally it was handled correctly, but lost during is_compat_syscall() cleanup. Revert the condition back to check CONFIG_64BIT. Fixes: 98f76206b335 ("compat: Cleanup in_compat_syscall() callers") Reported-by: Ben Hutchings Signed-off-by: Dmitry Safonov Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20191121000303.126523-1-dima@arista.com Signed-off-by: Greg Kroah-Hartman --- kernel/time/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -881,7 +881,8 @@ int get_timespec64(struct timespec64 *ts ts->tv_sec = kts.tv_sec; /* Zero out the padding for 32 bit systems or in compat mode */ - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) + if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) || + in_compat_syscall())) kts.tv_nsec &= 0xFFFFFFFFUL; ts->tv_nsec = kts.tv_nsec;