From patchwork Mon Aug 6 16:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10557419 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 0536213B4 for ; Mon, 6 Aug 2018 16:41:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E875A298C5 for ; Mon, 6 Aug 2018 16:41:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC1A52992C; Mon, 6 Aug 2018 16:41:16 +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 76F6A2992E for ; Mon, 6 Aug 2018 16:41:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40BA46B0270; Mon, 6 Aug 2018 12:41:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3BE616B0272; Mon, 6 Aug 2018 12:41:06 -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 171D66B0271; Mon, 6 Aug 2018 12:41:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 92CF06B026F for ; Mon, 6 Aug 2018 12:41:05 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id r3-v6so8972421wrj.21 for ; Mon, 06 Aug 2018 09:41:05 -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=YhiwXQETzFyRuKUoiUientUUS69FHU4d1USosDKGiBg=; b=Y9zkJ6sVv2l3fEu2CDjEXV5Yzu+6r+a3XFAzzojiDW3Iz8lkT5VugmSZEpr9ed3LVv 5g0iYHzB7hD6qFe/RlOOg5LWUYQBFpGB2SV5mEE//+7uyMVcoZK6RIBEsL2P6M4XaYAk mqpML985cdgJB80o7lq/KCP71GS4aoO7jdZr09fzOoyEM4pQJDmhtL4UAUiG5P7uu1jK trAPnHkGkWhmWDe5YG8IKyxyFzY9WjBXGt5yyKHuha8jHpd6vxMGU7I8wGxOmPx7DtSZ fZXL87vqtC6FR7xWqxUOvz1OIdny31ZJ5c9AOotkm9WgIRcLf4DKdqcZCK0i0qYqAsMD NJUQ== X-Gm-Message-State: AOUpUlEMREOHDIwb0QYHvq9TdbtUpziJMy0owDqeZFMsT0XouExutRAU E3WQbc7wZYtPpH8g6lTsAj5Qetov/OGU8oazEXCiMfhVEdH5YHRy5oRZiF89WzXXIZYk+YBXMYj 29K7M8SZWLuX1cEcrvn8kdklYoSByt78AFENLnpmbLK9yKqGuoZBCJjviKbVE2HkmtPrwT57sks ysWFjtAKqb2FTc1lhag6hjKq11fw04KXQqaDhQZS9+AfA4mF6A/28EGKERBH23J1D+4czu8ct1/ C4nL3gCfLBjuUk9Mz4t0R6MJDjY/3OpbUgqNoP7OkyRFaDDdA9x7y8ZLJ2RyLiklb/XmLliOOOW XF7QJ4jS3y+cH9KvQGuaFIUh76X9oiAcYpKfbtLMWLPy91zir+TxpPr7NqCHZi4U1Vr/PwDMcKg W X-Received: by 2002:adf:99ea:: with SMTP id y97-v6mr9943068wrb.215.1533573665026; Mon, 06 Aug 2018 09:41:05 -0700 (PDT) X-Received: by 2002:adf:99ea:: with SMTP id y97-v6mr9943048wrb.215.1533573664346; Mon, 06 Aug 2018 09:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533573664; cv=none; d=google.com; s=arc-20160816; b=I6vcAstgmxMQz48oYTKeyrni+h5qLoC60ZLuW+W01l9ak9Z4c8B+u0snjpoGm70NKm cujpREhj9Hua4TICBpICLhX8a2wryHfTC3WNJQXOFM2myHmE7caRqV65NoI2NK0bWJBd KO7p6xmBFWKCLN1xmknaSb/NW1GMQwJNa9fIVbF86N0+Ofp2z39PvVfc7eMlFGLY4/uJ dSwkDxAFdgEk8PmHG6PDZFtVS2pjJlXBO6Lx1BlCf94jJszESv6Z4NMhFC9nSQ/j6hY7 wduV9onfpPc4xTuwn+F4DBve2Q5uxM9WVcnS+xwvn4d3eJuJeiPlvXX900Fxa9wWHCeG A7gQ== 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 :arc-authentication-results; bh=YhiwXQETzFyRuKUoiUientUUS69FHU4d1USosDKGiBg=; b=r+OY7mmlH4u1UyiO7+wxFo95YcRtW6uk0M9CCug7saINUzE0Nc/vFzZ5pHFhtW2n+X gsF4+xthg/T4XXgRat7EJlrMIZm9k6MUoe031oqHtCMo6PmgjLhiw/zTgI3o+WHt78fI vfZkR2saFgeBofWBMVR5Wk9OqjK4m0dT5b46CK4LTLd+OnUuyvlsnLroMIRI+T9lWyh2 zlKOyDbF5T7Qh6sF6ucFcu6WAchkZDNzb0hwZQvobs9mBvD+Ys/DUZHvoKuK3z8fRF8P OT+9NNqLmawtEp9mk3qbZuemOiVo79UUTYYiBsaluwxchZxAXQeMhgsk8xzer4JnSUL2 Oy8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=TdFiCJWQ; 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 16-v6sor1649685wmg.80.2018.08.06.09.41.04 for (Google Transport Security); Mon, 06 Aug 2018 09:41:04 -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=TdFiCJWQ; 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=YhiwXQETzFyRuKUoiUientUUS69FHU4d1USosDKGiBg=; b=TdFiCJWQV1yY7auvDE3OMD8elRn00ZYfTJx5VBDb0vmH70JjcnkbCr00a2DIqbTxkS u7P78OkVA7gQ2mUn3ucxrt0JtyrX1cqTglzaw1x/dguRXxGb50g/t8CD+nUQK1HGE0Zp glmM2eLYnNtONsT7coR0+ZV/xEq9YDzXdaTDB163co13OWzCFpLqTdc6t/n/9mu5/ri7 jX1FY0jxM1iC2UpEDrLPzuZMntSNz0ZVEPRb3jD0WGCqCJ9fJXFePlZnlDJrBFnRiOvN tvYvAMZWoxtpd7wNSEtF6rRizE0sA+pJRhf7h3xozmr3qrKnhPbxGuFUAgAjiDuMzDpo Jisg== X-Google-Smtp-Source: AAOMgpfgr6iQdZfaudH/1Dxp198cQUe5jRBwkr+pUFpoQTY/gYwoncrlREotSNcycesndSR3fYlmIw== X-Received: by 2002:a1c:6d9a:: with SMTP id b26-v6mr11379886wmi.74.1533573663633; Mon, 06 Aug 2018 09:41:03 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id 66-v6sm16385790wmw.34.2018.08.06.09.41.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 09:41:02 -0700 (PDT) From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Al Viro , Andrey Konovalov , 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 Subject: [PATCH v5 07/10] fs, arm64: untag user address in copy_mount_options Date: Mon, 6 Aug 2018 18:40:42 +0200 Message-Id: X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-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 8ddd14806799..fd070e65e529 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2733,7 +2733,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;