From patchwork Thu Nov 8 14:36:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10674379 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 A784C109C for ; Thu, 8 Nov 2018 14:36:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96EA026C9B for ; Thu, 8 Nov 2018 14:36:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AFF32A548; Thu, 8 Nov 2018 14:36:44 +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=ham 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 D817C26C9B for ; Thu, 8 Nov 2018 14:36:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D960E6B0609; Thu, 8 Nov 2018 09:36:32 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D46B16B060B; Thu, 8 Nov 2018 09:36:32 -0500 (EST) 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 BC0696B060D; Thu, 8 Nov 2018 09:36:32 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id 314746B0609 for ; Thu, 8 Nov 2018 09:36:32 -0500 (EST) Received: by mail-wr1-f70.google.com with SMTP id w8-v6so7884667wrt.22 for ; Thu, 08 Nov 2018 06:36:32 -0800 (PST) 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=yMfnGtGqvRCyrqlswY+Q1yEYdnjSJs7L5yVY6s2C8lo=; b=rvV7qwuvhMpEbt35qOvQpPdWIyMFrz47y2euzX5WaTipYbbYUpOLCpPtHejJtuV6VK EZa9caTCVXgvzjeHdK2wKHTNVbMEhzDiw3Oa4YB5GLxO/auNe5YBHMhrOv5ZHd8BGHAu PaczFGU2Fj4yHlfGJNDXCSbIWwyYWPTjx+tpIjqxWZr1grA+kwIcKfqhFGtadBmWDJlN VgdYbT2zSiKUmiId95b0vI7CyH4x1Z3Tbh1b2g3JRleBxv3pV5kFn4aGYx4daDh0qud/ Mo7vGFDizGKopdgqxJVb19fAnCOeL3dG0ifP3cqNqINlQukqK1A1CADgIgUlPA0aVEpq hGlA== X-Gm-Message-State: AGRZ1gKyrFCTTiSG02aKxZUTW0bLt06gH/lT5m8dRIbFD/WdsnT3kCRS sjuILwD+n6un9QA5Scxpg08CWtQYrYMpG/lLUB0U/WC6mmlb9vWTURdmM41VyOAeUN5zm+qIbFP wVB8rTsFd9c/yvp12WRQ6K1GOpzLAWuTQP/86Am1jADP3uxCx9zGg4ZXJS9I1wZtZj+ypGea+Xm TYRroPsNEVbrrE2hP/UjQFd20c5WZaL+7wupwoIksdn2NvKCLQAVqvmsyVkKgxVf5cUjTkJHXrd UwZFoTrpVpoBAhG79/n8j8HGUjDCCNMW6gv8JozWHYDS+9t6G5qbI0Bbia+JS1gu1k/QqlGhlgF b3bir4xbvigxdvX9VRUK4m6vChTg4YO6IevR/VLEF4fhUvVKosQPSFwLxi+5MsZL5IMU92RRaXr L X-Received: by 2002:a1c:b8d:: with SMTP id 135-v6mr1389999wml.128.1541687790539; Thu, 08 Nov 2018 06:36:30 -0800 (PST) X-Received: by 2002:a1c:b8d:: with SMTP id 135-v6mr1389951wml.128.1541687789629; Thu, 08 Nov 2018 06:36:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541687789; cv=none; d=google.com; s=arc-20160816; b=G+bo8krE49vDTDmuRn+yAATJdjfhwMqfJbLED1pYhncUMASE7oXyU9ClTqPs84vqnF LjRm7m16ao/xkQc0vts9czcO7VFB162fg9+VodV05Fmy307DJYv8PKffpiHk2sf/lBOd svuYwHo/dBjiM9Sy0xOJuM6gZF63RsVpLNDMIYnu4pA7oYCOs1WlAuE6xdRd/i0D1D/G UMLoqDATJ40mYl4+ru9d/gi4YiKCpPX/bHnWdKeivArNcfbJ1QuombeYHX1lrgW9CCFu vS2CWSme3vlcFWYw2nwArypLAhnns6vyP+kUIl1oDfe3GI2Pn+il/LLm930Cf8LjQBWq LbcQ== 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=yMfnGtGqvRCyrqlswY+Q1yEYdnjSJs7L5yVY6s2C8lo=; b=Z1fcYH468jZVoiJt505R7m5+DkxtOwg4UQo7zdmPGkH/Hu0WWkQii5j4JPlvolDqpD LLMfVc6+o8vWh4kAr9OyJkHTbbbLScBkZzvqPb7Uy2H7h0Pkl+gVcrGiK9OfzOaGd4/B xRQ4qGGN1c5MpGRnNQqeCwjG1fIF5BvKicqhyKDckEJzgTYFhvGQMuAeOGw6JJWnu8P5 NZZbTJiBDroiiXOvnVWyeJU5zKVCEPR4Vnj9b8jRnU6UpT3JXz+RHiJ+ShN2HOfGhJLr FlBT4kYObPDtOCwOFG6/TwrhrRWsmSaSri/otm9JgRt8p9z3wexIT1Z0ZTI61YYZdHtf 3iCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=OSTpJoAO; 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 w7-v6sor3101954wrn.19.2018.11.08.06.36.29 for (Google Transport Security); Thu, 08 Nov 2018 06:36:29 -0800 (PST) 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=OSTpJoAO; 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=yMfnGtGqvRCyrqlswY+Q1yEYdnjSJs7L5yVY6s2C8lo=; b=OSTpJoAOkRI0ha5rclaP8H3RmP+9ftj4eIBMetkNB1rSZYKkx6QyMUtvsfT1I3Kbsi nqq49Yy9O0XIeGCBlu0DPUC39BhChXKHgATeWUk2Fi3gh0t1QL8BYV6K4jiy3T2i6GNH VRkY3HLu0OXnhKnVS6lf3PrTZZrby7lQuqhxR85J0t5SJLDHDokRqms7hvRLEo0fiOk5 qXqzsjE//9TlVAWpqziY4CaFF5r83iPytuR7OvbTtP/y28wAZdWtDZB4Xu6aS0GvYmpk /IynZxRnIUJET/vhUgCb7aqU51FOWJpPnAr9pJIHVMZ/tONQTR1EhR7OVdPJRK9CIslK 04FQ== X-Google-Smtp-Source: AJdET5eI6mep1KozRP67zq2F57bYi00Ufy/TNGQH9gCb351dH5ClKuaGSs0MjfRiBrsX95XmOTVJkQ== X-Received: by 2002:adf:f382:: with SMTP id m2-v6mr4327147wro.111.1541687789216; Thu, 08 Nov 2018 06:36:29 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id k5-v6sm5421068wre.82.2018.11.08.06.36.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 06:36:28 -0800 (PST) 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 v8 6/8] fs, arm64: untag user address in copy_mount_options Date: Thu, 8 Nov 2018 15:36:13 +0100 Message-Id: <12fc6c9e4896b394800776c54b16b26e2003a9df.1541687720.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-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 98d27da43304..1f1f998d15ed 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2674,7 +2674,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;