From patchwork Sun Mar 30 12:17:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032902 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D0F5C36011 for ; Sun, 30 Mar 2025 12:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D511280005; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36083280004; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B0F0280005; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E67EB280004 for ; Sun, 30 Mar 2025 08:17:39 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 32AE1567C7 for ; Sun, 30 Mar 2025 12:17:40 +0000 (UTC) X-FDA: 83278118280.29.095F9CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 7723B40009 for ; Sun, 30 Mar 2025 12:17:38 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fdkTjFR4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337058; a=rsa-sha256; cv=none; b=hE2MFfar7qq5EebqjkfYijrRaEi55Hy7oV8yNsTDQvmHcA1Chn9QsfO/iCe3TLdkrHnW0F HbYAQRg6HnUVkPq0Uu2JUrSvHrd4l+UA8eYdZ6NQAhV6zaNfLeo7s67P0j5X4svVN8uEpB XTfKtJWazEPZ2F3aclJzGNOfCBr//WQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fdkTjFR4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337058; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0G+7enjJ3hUuHc8nn+ZMKDLjMZiATmJ3BHld8fzSZf8=; b=bwKzBg3/h4dLjurWMvjwOsCWJn0mlVhSTLN4txJkTdRj883J+I4AwRw/fStXFpA58wqoKp y7iVCxRm7cfR3qTDX2KoRO3X5SQjomumWbsYYrqg1tOtOE/fJxjGxoJPpeeWOdVwvO4PL/ AOg4nzQTYGqCUFeFfiGfEIeiaNBJKP8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0G+7enjJ3hUuHc8nn+ZMKDLjMZiATmJ3BHld8fzSZf8=; b=fdkTjFR4/u+RmrFojedpqwCuRGBUUKbaj1vswAv7fmnM3utCv0qQXNgIxGOaVcOII5uzVj Ad3bAuIvyjfY+DWZJ3NuXdQxjtujHQsygH3IqQyyMGYkTw4F7328unXanhuphZGkcOI/QP TPuWw3jGsWhoDtil0IQwSwUiuruO8fY= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-fhcRkH7YOYeKvg-myRGkUg-1; Sun, 30 Mar 2025 08:17:36 -0400 X-MC-Unique: fhcRkH7YOYeKvg-myRGkUg-1 X-Mimecast-MFC-AGG-ID: fhcRkH7YOYeKvg-myRGkUg_1743337055 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0173E18004A9; Sun, 30 Mar 2025 12:17:35 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BD13180094A; Sun, 30 Mar 2025 12:17:31 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 2/7] mm/gup: check if both GUP_GET and GUP_PIN are set in __get_user_pages() earlier Date: Sun, 30 Mar 2025 20:17:12 +0800 Message-ID: <20250330121718.175815-3-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 7723B40009 X-Stat-Signature: 64ui7cwoj9usfawfsd8ephq6op8mou7t X-HE-Tag: 1743337058-915689 X-HE-Meta: U2FsdGVkX1+untHMvRfoTExNk+dB1RBxa5AGXD568piDomJK2+8gGT9ncFAuTqEkTHUZ46kJ4XUtWgPE64yJIfMYt9r53jkM3Tl5y3zKjhP4dFqDzrCVov6m1KydG8T5JrmxFpCsqcjCwfhNvKg3oqsub58qpNA8huTpRafgT6TCB8Z4weg5Qbo9jQQFT+Ao5W9P/zD/yDEn0tBKWO26KN/J7RQzsVVglXrmEEan5wBrl3kis4hGg1DMzNlYJKPz4fYWDIV8tuDDKuzVIrVifDD/6g7H21sc5L2DcL0QlMvyKbum+gqodqS7fg5ZU6LFV5mbbeyEBA5PXW26xPSMtzHMQAtOGnXYKoL5HhGnNEZQFlEe6V+SbpMGeD/RPD209xczJZshyvwRi0BXPonTIC4zyHD+V0dsx9R2FZFYL9d9taboBVnmFK6dWrMFA9pgvomMFwJKXQCeTk5LhB0cjX6hjvYkh+XXbewt0qwlhe8yBh6kkpoCSRiZwfx3qKdo3wS5kIsC2i+VvyCcRJaet+Ad/HtgvW0pxzgBhsSBk0NWuetnhbw4BMFqW8JPV+4NxLCZzcHddme8rYET/yk7h+Fq+/hWW/Yr1nNSfjbpAgh03Z5IMsRlLkCwlSEaDiEcXdbyv/7/qDr2klzJX9rVDi2BKprgpn64HkFwzWy/v6qsKvluJVHGXTR+ZVLYZAgEXbrRDVJJF/AAoPULagHyyHx8kqxDF/OZ8eCF4HYX3mZxFlT6elV4ym+qz82dvjXLBJzARYT2EHI6lAPoVMBN8V1NjbfGomRzmcPKm4sIzrpeD8ij82turwmwmSRk80L0WWK1jOGajZtIb6+lRoo7mtq/dFajdO21wkJDhyByv1TUMwTt6weqiiGWtSzFfnQuzd4XJOyO1LgAaVtA+wl62c6KtzRpVT5n6+yFE0KxfBHGfjAABsLp8PXk/XJccGOafXqt2KuKasLIlmy91XP M0arPiLf SZHAVvpIQ3imGOm8ZZiVER76WMNUgplGEOxX8vaK9kQB9v6tCqCGRL+mN6bftujIZd6oIcUdYLcqyDT/LkGE2cPbCrC8mwNZI8iZrIraPZPNbDZ6hwfZ2PHqxd9y7JOW/xP1n8WYMkfIdAIkjPkDKoQv5rfrUuLZOXhefRFVa6OrmS2Cfkn62Qa2g3daJ4SWapqE+oxC98y6E4un+eJDiB3cw4K9OoJ3Rg5i6DfQmx+bSX6/3Z5mkgJUzs9loNhZQVRPRm2PkJ2iKX09ygtoqqT8sTBfV/zVHH5aezltLQaRJTdue/0ifg1jiQmxAM+nzWmAxXdoVUAliDCk1mTXbZXzQSMxDSK6xr/jvIdf4D5qq2NdDMSTKBfY/h2wg+homIZmV 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: List-Subscribe: List-Unsubscribe: In __get_user_pages(), it will traverse page table and take a reference to the page the given user address corresponds to if GUP_GET or GUP_PIN is et. However, it's not supported both GUP_GET and GUP_PIN are set. This check should be done earlier, but not doing it till entering into follow_page_pte() and failed. Here move the checking to the beginning of __get_user_pages(). Signed-off-by: Baoquan He --- mm/gup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 73777b1de679..8788105daee8 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -847,11 +847,6 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, pte_t *ptep, pte; int ret; - /* FOLL_GET and FOLL_PIN are mutually exclusive. */ - if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) == - (FOLL_PIN | FOLL_GET))) - return ERR_PTR(-EINVAL); - ptep = pte_offset_map_lock(mm, pmd, address, &ptl); if (!ptep) return no_page_table(vma, flags, address); @@ -1434,6 +1429,11 @@ static long __get_user_pages(struct mm_struct *mm, VM_BUG_ON(!!pages != !!(gup_flags & (FOLL_GET | FOLL_PIN))); + /* FOLL_GET and FOLL_PIN are mutually exclusive. */ + if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) == + (FOLL_PIN | FOLL_GET))) + return ERR_PTR(-EINVAL); + do { struct page *page; unsigned int page_increm;