From patchwork Mon Aug 5 02:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11075959 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 9871E13B1 for ; Mon, 5 Aug 2019 02:26:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ADA7286D0 for ; Mon, 5 Aug 2019 02:26:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68986287EA; Mon, 5 Aug 2019 02:26:35 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 E146C286D0 for ; Mon, 5 Aug 2019 02:26:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE5156B0003; Sun, 4 Aug 2019 22:26:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B6DE66B0005; Sun, 4 Aug 2019 22:26:31 -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 A36E96B0006; Sun, 4 Aug 2019 22:26:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 6BBC86B0003 for ; Sun, 4 Aug 2019 22:26:31 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id x1so2815608plm.9 for ; Sun, 04 Aug 2019 19:26:31 -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:mime-version:content-transfer-encoding; bh=lcnoyc82zBJmK7HyZZ9/xYHIo+nvY1F0Vc3WAAWFXf4=; b=Z2du/mfU6a6mk9QWchNluoWy05rQwnCtc+m1E+qVa4FYuWejSu+Z1kbqjIGpS/9fnJ g/UcKspmuOUOsslJcd32AfL2qhyRIXCdLlB0VkyhASjI864SPvVjsW+hIuLI7V/oZI1E ZDv6jNERk8JceVsj5tYfE8fe5Og52LsqpohZKAiDs/wxNe/MCNrrDhU7+0ub0pN81S35 zoUuUrwSrXuFudAkBBB7B3zeuLB+pZF2CBl62+vqPADHBfTxBcaxojdrYxUtaBXTGWZD HbSwLZZxxM+WHyT35HUEhGY4KI2rUkangzyXajKTgHioRdIx/o5lhNn9dqbKNqUE5zVB Vu5Q== X-Gm-Message-State: APjAAAUCcb0Oc8dzKcu4Vo5a8HoTyQy1I83I8VhqRtaTLeqrH8R2xuhh j16rMzkjaXLulJAC8DeI2989sa14jIL7ri6L/DAet/ns7Muji9A3DVYeqXktoOKPsI9Wny2NP7v aXVqVBJwNlex1FtNeizqFYcuP12OE49/c/2ADYrhc2rdJk2MNhuuwBC9kYY7/rdgDWw== X-Received: by 2002:a17:90b:d8b:: with SMTP id bg11mr15965261pjb.30.1564971990953; Sun, 04 Aug 2019 19:26:30 -0700 (PDT) X-Received: by 2002:a17:90b:d8b:: with SMTP id bg11mr15965218pjb.30.1564971990049; Sun, 04 Aug 2019 19:26:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564971990; cv=none; d=google.com; s=arc-20160816; b=fzR2eZ4ou+B8jGnnWBmPDpKBKL1HRDYPYVR1I9fkZXKYWrjjfdo67xHeig51DtKM7e qtpCcnhd4XRknaHcHdnS0QuIswMYquUvGS8QWBLmQXvcIKTiBzPWn6SLA2l+qOahZmK1 /5cymRlio6AMeEGhcQCPeJX0HZmyVNdyoErvGf9SOO11Ppm8sUPS1nj8ZiCDjZJiZDQs l2IZuLg9pDhx0z/mOdBxYhjywPRmjubjVfevMvrQuecV7u6pp1132gQf3/lArYdr1uBH 1SpRNbNknkDx+en2rlX7JyJCc5Twj9eCfEDtRIG3npnm8CXKreES3JXiLnw/qJJ4u0OP 39+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=lcnoyc82zBJmK7HyZZ9/xYHIo+nvY1F0Vc3WAAWFXf4=; b=vxi0TKzbNelu0JtlayfezQGaaopBvN1FZ4T1iIv8qmxXbc+zxr+l0Z2LptrsaOVXtl jq6uNrcSrqf4nVyCaAy+3cdDgG1oVpqfl2JG3teAHIQg391qQMUWm/vH5DNnBHct7hOz RinQ8YZykvmRpWSkU/LK6Z10dgFKB/Hwcz7CDJRhiKMq73evhp7gwsSCJK9U44Kv72bt 6TDXYEv4eVz6ULKNGt/Jrxh92MoYHjfotFUp6q/Vpb+lJnT1sbKZeI7SlDVi5wCr/X0/ DejPxGz13MaP3IoWLYWssMJ/o7e+NPV0/vQeJzjoe2UeLAvEcegAjGMwVGn20XIV9mN3 tmqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bjxN1i85; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a25sor60868211pfi.29.2019.08.04.19.26.29 for (Google Transport Security); Sun, 04 Aug 2019 19:26:30 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bjxN1i85; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lcnoyc82zBJmK7HyZZ9/xYHIo+nvY1F0Vc3WAAWFXf4=; b=bjxN1i855euNnjUnIRlcEX0LvYqx3HxLcGznZolbzXrZ9h2uenhVqHuurr9ZBo0Mdn BEsRrms5VOqtu/pZu/TaKYkRFrpT11Va6g+49pLA5OWY+SZ0hMDbYRKwmWmxzMDhbb8f GTQVuKdH4sre765l2YwqLwgEj5U5TCxJ11dgPQgtD9/F7nITzsxx1q+K6fPt8AJTwZ51 SXQT/3NcHGnARj71eCFz2j1ZKbUjtfQuqmAtbXa6juripZelfrT7KMWdgAkVhlhszJJH Qh8QWc4/xPlfmZB6bDU1IsGkYlb7ALstwyWPJLnNFIgVmfoptlw3rJFEc3KpcOW6cCi6 uYRw== X-Google-Smtp-Source: APXvYqz56Uy3OWp9yKpnmoBerTa/QncOG/6somzUXYkyfxRhF/JGW0ZcxzT4FIvpzsPEHyTa4Zvc7A== X-Received: by 2002:a63:2004:: with SMTP id g4mr128483482pgg.97.1564971989557; Sun, 04 Aug 2019 19:26:29 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id s6sm122624067pfs.122.2019.08.04.19.26.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 19:26:29 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Ira Weiny , Jan Kara , Jason Gunthorpe , Jerome Glisse , LKML , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, John Hubbard , Kentaro Takeda , Tetsuo Handa , linux-security-module@vger.kernel.org Subject: [PATCH] security/tomoyo: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 19:26:26 -0700 Message-Id: <20190805022626.13291-1-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-NVConfidentiality: public 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 From: John Hubbard For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Cc: Kentaro Takeda Cc: Tetsuo Handa Cc: linux-security-module@vger.kernel.org Signed-off-by: John Hubbard --- security/tomoyo/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index 8526a0a74023..6887beecfb6e 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -931,7 +931,7 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos, } /* Same with put_arg_page(page) in fs/exec.c */ #ifdef CONFIG_MMU - put_page(page); + put_user_page(page); #endif return true; }