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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 954D8C10F29 for ; Tue, 17 Mar 2020 14:38:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 626E2206EC for ; Tue, 17 Mar 2020 14:38:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Og3z1bMi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 626E2206EC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A1di2BRg3YMlLZFJb2EvU5WPgN9eBebW6yVvKPC0Wy8=; b=Og3z1bMi9lXLks G7NZN1A2F6RI2MdodSygf7GaprSx/kpz71GVdN3QW+8D6qemAyeoXMNn57ooJ8FULri4keWQwPRXA QR0NuVjgY+I3ZpC5u09Lfn7V2ItLJ56EsK65Suhx6Au/4r9RamTG5Mjwba3dU+3lFHhsLkpKPoeap 1XHAE0k5NlQOAdY4WqJJeBRU2GiyZA+bH7D9gApOkTyhzl1/taiHDEhyuyCcXo0+1W6ZQIdmFQNNO ojcmIobsW9r/gHwwwWd41IYYaxA2Eb2+Rn127oHHZSJtPTCoJO74msyP4w1n0q9/zDOtuHM8+zdqE c1mzaGDoc5enPF3AtUqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEDMh-0004Cn-8z; Tue, 17 Mar 2020 14:38:43 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEDMe-0004C1-D9 for linux-arm-kernel@lists.infradead.org; Tue, 17 Mar 2020 14:38:41 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 19D3630E; Tue, 17 Mar 2020 07:38:39 -0700 (PDT) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.196.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 241AA3F534; Tue, 17 Mar 2020 07:38:36 -0700 (PDT) Date: Tue, 17 Mar 2020 14:38:34 +0000 From: Catalin Marinas To: Vincenzo Frascino Subject: Re: [PATCH v4 18/26] arm64: vdso32: Replace TASK_SIZE_32 check in vgettimeofday Message-ID: <20200317143834.GC632169@arrakis.emea.arm.com> References: <20200317122220.30393-1-vincenzo.frascino@arm.com> <20200317122220.30393-19-vincenzo.frascino@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200317122220.30393-19-vincenzo.frascino@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200317_073840_489757_1D324DAE X-CRM114-Status: GOOD ( 14.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Dmitry Safonov <0x7f454c46@gmail.com>, linux-mips@vger.kernel.org, Will Deacon , linux-arch@vger.kernel.org, Marc Zyngier , x86@kernel.org, Russell King , clang-built-linux@googlegroups.com, Ingo Molnar , Kees Cook , Arnd Bergmann , Will Deacon , Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Peter Collingbourne , linux-arm-kernel@lists.infradead.org, Andrei Vagin , Stephen Boyd , Nick Desaulniers , linux-kernel@vger.kernel.org, Mark Salyzyn , Paul Burton Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Mar 17, 2020 at 12:22:12PM +0000, Vincenzo Frascino wrote: > diff --git a/arch/arm64/kernel/vdso32/vgettimeofday.c b/arch/arm64/kernel/vdso32/vgettimeofday.c > index 54fc1c2ce93f..91138077b073 100644 > --- a/arch/arm64/kernel/vdso32/vgettimeofday.c > +++ b/arch/arm64/kernel/vdso32/vgettimeofday.c > @@ -8,11 +8,14 @@ > #include > #include > > +#define VALID_CLOCK_ID(x) \ > + ((x >= 0) && (x < VDSO_BASES)) > + > int __vdso_clock_gettime(clockid_t clock, > struct old_timespec32 *ts) > { > /* The checks below are required for ABI consistency with arm */ > - if ((u32)ts >= TASK_SIZE_32) > + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) > return -EFAULT; > > return __cvdso_clock_gettime32(clock, ts); I probably miss something but I can't find the TASK_SIZE check in the arch/arm/vdso/vgettimeofday.c code. Is this done elsewhere? > @@ -22,7 +25,7 @@ int __vdso_clock_gettime64(clockid_t clock, > struct __kernel_timespec *ts) > { > /* The checks below are required for ABI consistency with arm */ > - if ((u32)ts >= TASK_SIZE_32) > + if ((u32)ts > UINTPTR_MAX - sizeof(*ts) + 1) > return -EFAULT; > > return __cvdso_clock_gettime(clock, ts); > @@ -38,9 +41,12 @@ int __vdso_clock_getres(clockid_t clock_id, > struct old_timespec32 *res) > { > /* The checks below are required for ABI consistency with arm */ > - if ((u32)res >= TASK_SIZE_32) > + if ((u32)res > UINTPTR_MAX - sizeof(res) + 1) > return -EFAULT; > > + if (!VALID_CLOCK_ID(clock_id) && res == NULL) > + return -EINVAL; This last check needs an explanation. If the clock_id is invalid but res is not NULL, we allow it. I don't see where the compatibility issue is, arm32 doesn't have such check. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel