From patchwork Tue Oct 2 13:12:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10623639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B493A13BB for ; Tue, 2 Oct 2018 13:13:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A937D283FE for ; Tue, 2 Oct 2018 13:13:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A663028900; Tue, 2 Oct 2018 13:13:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3387C283FE for ; Tue, 2 Oct 2018 13:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6E586B0269; Tue, 2 Oct 2018 09:12:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DFAF96B026B; Tue, 2 Oct 2018 09:12:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC1FA6B026A; Tue, 2 Oct 2018 09:12:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by kanga.kvack.org (Postfix) with ESMTP id 62EB86B0269 for ; Tue, 2 Oct 2018 09:12:56 -0400 (EDT) Received: by mail-wm1-f71.google.com with SMTP id f124-v6so1746374wme.5 for ; Tue, 02 Oct 2018 06:12:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xOEYtA/I6Fm+wYElUl5x45bwyq3Cixn9jAS0SVOnGHY=; b=cG/U3KD7+jv13rOv9pXHAskg1nVJB8XdGC6quhODEHyjrDd0SK96q6HSwReOkKriQi k8EuIwbot5P/nBr39FfFkvopZNXIqOZ3mftKwIzN36C0WhExxx09M8xPZP+J5O9a7QSu aD/HBjKW6p8N4PtEvnN0L0be0wj5VeWCLkRS7V+RWkY8vr/asN4L4JcYTbgQ9QheEv1a 5MGbUW6uf2qq9pbdE66PLCKYWI5k4Q6PYYcLGguQ18Q7wFJJ/joUuuLXEpigrUdQNrmy MbiNjo8Q5sQKUOC8QSF/Z4Qua22akouUqOpGREMErWjy7RX14WKppyjw3rWS5kSg58kd 25nw== X-Gm-Message-State: ABuFfohzEP+qgNHNA+LVE4Gpo9TBgvmDRB3sRPKTId+QBqEPnAV/ZWqA B566Gi/j0SgZAsmtaqNMK7WrSPapxzKbd1Wxp4qynE5cYr3462qbUSa2Ver8B5AY3d7A0GpBKm2 DR4iiOwgK9FRSHfHtv/e7V53fhqumlK+ZC2QaAVgaCvDfEVZvEaoDCsCTbV/T/N60HGKleJInWv QXwv8R6j7GeaKKkGNad6TUU1tpVMqADJ6NOWxiqTr4M5jEKzbmnCLQUXmDa7HQIugMn+v8NNM5n pF2GVI4SuOePm9E6n3B3NjdJI2aJcT8oHLdlm2E33YUAqQvpx2sCR/7GWejWydRSwW5xMPt1tB3 FtUp3+DtsDuuSN/DRKgcDxQtBu4lb7RxqDr7zQZAthf0YYbxtCYAy9rZErfQT7JIg52JG+RXHi/ 1 X-Received: by 2002:a1c:8b94:: with SMTP id n142-v6mr1910759wmd.38.1538485975870; Tue, 02 Oct 2018 06:12:55 -0700 (PDT) X-Received: by 2002:a1c:8b94:: with SMTP id n142-v6mr1910728wmd.38.1538485975120; Tue, 02 Oct 2018 06:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538485975; cv=none; d=google.com; s=arc-20160816; b=lHWxvwm1K01SC01yBuXtfIYSE4p16u4pGdHpfo5dDj334iANVO8OdrAJHPbrw7uPpC 58nhRHIYeEbrrAsGuMqGCtsJ3hhbpyPT75OkNTiimaAaw6CGafT+4HPM26Lw9jlBLr2p Kj9H/heHsoKKguKodfWLPgMTgxLVuCIm6QXeHechxmzYIyg6R2Gd5/H8FatW2xk9XJwh HexhrJ0iXIDUu5e8IckBb8sPNFiY4QknG0Vjwzws2Hcj0jZaVaJ74snmPIiYwqhT99J1 gzjdAHlTtuIApVaSgDBO4hog0ojl9Naw2kBn14thsyjy5vLh42qB7wHj6utmvKkPInWV kZdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xOEYtA/I6Fm+wYElUl5x45bwyq3Cixn9jAS0SVOnGHY=; b=nwfB2ycNYKRv1Gz3iFfO0P/EA4cZXrVJK/5ylIoYkGxFAewaOj7s9y7IESPn69DMWB Bbb6uysvflrIP+FouyujYFAwjWTyvkHx51iH1ctrQO98ZvINkOCBGPVPw4H9h4DibEKm wz0edAVQDRicAaVJm2lBwB+sqdzl8r6OQDPllzSwRY0UTgizX4FDgWfUNc9HQhqhmngQ 6p9Pa9ie3eDY33nhGH2J7vomHbkIOqCazkUhKVI+rCz81fnOsPUIvVNyVczH2ZVyYKyo rETpM1SRwsXQ7FhSTe9ewykzq0afbaUYKaEJUvJcW16CNZaiwU6ep33LKiM15VTESV89 iZ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=hapSsxwd; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w111-v6sor11155247wrc.22.2018.10.02.06.12.54 for (Google Transport Security); Tue, 02 Oct 2018 06:12:55 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=hapSsxwd; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xOEYtA/I6Fm+wYElUl5x45bwyq3Cixn9jAS0SVOnGHY=; b=hapSsxwdWXwCXhX3cx/PcxUUNiBlkLbDk5Ol0GIiM68H9rsaDKFOhEppykmnJbSMIG hP4HvsnoWoqCLF1XH0klHSE3kJRDP7PzPV+P6sfrd5jZTa5O9wY0NHxHbg+ssowNWDAK jMZK0Qtbun2y4bsuxkmMQDRH3ZXywQU73104mMawS21UPnCx0hs79aj2FTAWAvr0G5Zk bxZmeY1y8kNyiwgFzrMFxb0Kd5/hqdAgiK5/yWb9dAnFsWl2bEa6+ntzVC/LqyX7KdsE qebdV3d2DvQAFlQK5j16Cw1+qqvmSmApY2GvOiRAmqs6XOLDd7R47nErQEM1ADlvsb3k CIGg== X-Google-Smtp-Source: ACcGV61mrD9eqhs6Y3Sph53EBteAZzSIYlvW15ySh9La2vNV0aqpQtde7IbKlj9BD/8p9DYuC53IiA== X-Received: by 2002:a5d:6707:: with SMTP id o7-v6mr10890380wru.326.1538485974696; Tue, 02 Oct 2018 06:12:54 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id v10-v6sm17458681wrp.0.2018.10.02.06.12.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 06:12:53 -0700 (PDT) From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Andrey Konovalov Subject: [PATCH v7 6/8] fs, arm64: untag user address in copy_mount_options Date: Tue, 2 Oct 2018 15:12:41 +0200 Message-Id: X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: References: MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In copy_mount_options a user address is being subtracted from TASK_SIZE. If the address is lower than TASK_SIZE, the size is calculated to not allow the exact_copy_from_user() call to cross TASK_SIZE boundary. However if the address is tagged, then the size will be calculated incorrectly. Untag the address before subtracting. Signed-off-by: Andrey Konovalov --- fs/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/namespace.c b/fs/namespace.c index 99186556f8d3..51f763fb9430 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2672,7 +2672,7 @@ void *copy_mount_options(const void __user * data) * the remainder of the page. */ /* copy_from_user cannot cross TASK_SIZE ! */ - size = TASK_SIZE - (unsigned long)data; + size = TASK_SIZE - (unsigned long)untagged_addr(data); if (size > PAGE_SIZE) size = PAGE_SIZE;