From patchwork Tue Mar 5 03:05:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13581569 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 68192C48BF6 for ; Tue, 5 Mar 2024 03:05:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3A666B0083; Mon, 4 Mar 2024 22:05:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EEA4D6B0085; Mon, 4 Mar 2024 22:05:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB1BB6B0089; Mon, 4 Mar 2024 22:05:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CC1706B0083 for ; Mon, 4 Mar 2024 22:05:26 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 68067A1209 for ; Tue, 5 Mar 2024 03:05:26 +0000 (UTC) X-FDA: 81861494652.26.3B5B664 Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by imf27.hostedemail.com (Postfix) with ESMTP id B148640013 for ; Tue, 5 Mar 2024 03:05:24 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PRali6XK; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.167.177 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709607924; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Lvs1TetY/ywxZOqb7cu6/qS8FYbgNwju0ZDKmLnC7pk=; b=XsmwH9hHuq23uwv4jT8sg6MlGNxUcGcpOo5auj2EYN1ailUbzyrqYLJmknrkMS9EygecH3 PxZgc6dDd2JCXhLREmU5K+fCrkyrt6gbnPOHGyl2zf6c7sGjwfD9vjvb6V3qbJIWw0bEHf 4bQ1Nk4fUxGuloHaiqzKlyiOhMnbci4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709607924; a=rsa-sha256; cv=none; b=0QsXWrLl+pbx6Za5VnanISkJ+vFMMs909xUp+H9BK1bqbBIQy52uFgwdMyDNipT7merAdx sUQGV3YGZbmqvgbPjImPor85rXOj/OKwCGToD/0zNUQNu4S1sBEMIaU60HpBofzu5iac02 CC5WEPOSuLUaivDqaVQnt5Zv+hHURDQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PRali6XK; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.167.177 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3c1f6a387a3so511419b6e.2 for ; Mon, 04 Mar 2024 19:05:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709607924; x=1710212724; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lvs1TetY/ywxZOqb7cu6/qS8FYbgNwju0ZDKmLnC7pk=; b=PRali6XKalIemDhb8d0o4Rk4rkrOTE/3T/cCEWJJALwXp/Loh79YWKuStVduBkbMGb b1r1Q3013JYa8mDxFZjGPSodR/5ncx6/UQapZfNOaKqFJyfc7aBMWGffd4is1ZtxGZZf TCrnWN9NtsijOptCqywOQBaWWWG3Dxlx4fdiTIdbAN4dEoRbZKSeQ4YOPKUzy/KYmm0l 1yDSJaXy9peg0rSbN6BYTG1HMF4j8mkqJAGR9h+94elYmXJFHM0b3etYjoduOcJf+U7x QLncVZaarVRrAxPpnFgVgn4tAygaopN/T6NRXvjxvgIn/RJB8V1My2tH1WtwbRpz6LAl IPvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709607924; x=1710212724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lvs1TetY/ywxZOqb7cu6/qS8FYbgNwju0ZDKmLnC7pk=; b=onZIPCFakn8KvxqepQDzIENWG5OmltVfFKAG+FkCTN9tktD9KjN14T+bDZABGTHqGd XQEc2iHGuU+mHCONYg0mnXkvap3e8MrJUQcybNxYwGC3W014qMOFCAL3w1LsfiyN3cNw HIQPVHK2yieLwjA9oKs72cE5Mhqb5xo7HZ+NWIqNeqwxdlvv3Kp7CazTcvTWc9xK4Wr5 bCvCaMIsMikW1FPetxCh/yJLLuXjXOyv+IIYJgSr49oDgKGE5NlvfVgVCGi+2b+8LFvi y24JRo9o4F6TUr76hAScQQiDERAUgcQpuS9DrD0YVWjG7OJT14eH8DI7djez6+REgkzM aNpA== X-Forwarded-Encrypted: i=1; AJvYcCVQ0Vyj8NMLiD9USRDczh6e404om3JWWjbbWf6mtWeS3+E7TPPtxxm5U2qAAaLNOZkWuNxE+PZ/i05W3E/vFSoifO4= X-Gm-Message-State: AOJu0YzLIEx1jy7jxZ095VKFSgBl1jPpkO6ENlSOHWUMGEel6beDOs4Z 5oP0g0pnngTu692r/t3JA8OelxfM237uxQgm62dEWfOkuajP2s9F X-Google-Smtp-Source: AGHT+IFYfdb0wzVKskM65cSKwSSitCWQ5HIwpxCM5POpmVMYG5/Wx6Ndr8UyOlbODBpKZ1uFvI0VUw== X-Received: by 2002:a05:6808:4c3:b0:3c2:c13:978c with SMTP id a3-20020a05680804c300b003c20c13978cmr597466oie.5.1709607923728; Mon, 04 Mar 2024 19:05:23 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:9426]) by smtp.gmail.com with ESMTPSA id i37-20020a635865000000b005dc5289c4edsm7941060pgm.64.2024.03.04.19.05.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 04 Mar 2024 19:05:23 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, torvalds@linux-foundation.org, brho@google.com, hannes@cmpxchg.org, lstoakes@gmail.com, akpm@linux-foundation.org, urezki@gmail.com, hch@infradead.org, rppt@kernel.org, boris.ostrovsky@oracle.com, sstabellini@kernel.org, jgross@suse.com, linux-mm@kvack.org, xen-devel@lists.xenproject.org, kernel-team@fb.com Subject: [PATCH v4 bpf-next 1/2] mm: Enforce VM_IOREMAP flag and range in ioremap_page_range. Date: Mon, 4 Mar 2024 19:05:15 -0800 Message-Id: <20240305030516.41519-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240305030516.41519-1-alexei.starovoitov@gmail.com> References: <20240305030516.41519-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Stat-Signature: wrwy7r1b164izbzg47zbajtgbjoh9cw1 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B148640013 X-Rspam-User: X-HE-Tag: 1709607924-966357 X-HE-Meta: U2FsdGVkX19dKU257jq5hLpuSAVOyzoqamOe7FLOxTBpynzf0vTUDO3Jly1geCuXc2ALBFkn0QMZAYj/FaWVvgNEHtGbJHUMEhBExr/7kFmItRppOKFYlu/fEBelItasDKvL3e53VYW8P1t4Ispswr9+Sm34VAShQUpbz3cymbDpu00+WfUjDXm5SZ1dPD2uNiYqzcblPSd9j6rE6Ru8271QUTzMJmuRD7sYuqHZGjrqTqlCmrqFCqMA/cOMa8R7CtYzjTc7RGooMp8y326UhRfayPS50gCdl30deshVMJF7z3d656YIFfYRFZLyk3G2GIhwT1DQzTc9gqELaynrQh6pbX74swcaWAGqtAhRRGyoqtLQxPkE8b4aVCKdwMTt09J2PLMJV5XvPSK5/THxfHTdUXMeBaJyK3ehkOn3Gnwhr66U3vZP/tlj0Hn0DYSMixXbGkoms43vJxxL7nP3ouG5M9NkrdA0VKIXVsRKKeMMoWpYGV8Y4x9ZfLh0cMXzepXOSu3X7jz8tNypZ+JagRVfAu5Cmjietc3eOKX22H3sjCAWvZfGBP6eHXK47tj/jroUk/HqyDgXapm1ybJs9h5md2SKH/Wrzzd4J4r7Tj42vGNBS0Z+67+LrRaAM0o2oB6yJsOsur/bbrXaEPaxCIjuz+UM0FQnqYUZRxIfzCyPmMdiI9CXwnpyOt8nUiRp6NHuXRj6B2N5xvrutb1o7gKDf89gM6Izd9g6rI/3PArkQbB26Yx/L/n1WyK6iYXm1OiL11QiT+4b62WiVlNOY28WJZvil82v3ZLQ8a9kaBoEtg+obEFgbtZC9tTB+ZXZKXQ3yM+ZULH/4Kh58bKUmG397OHLgjyUotPlKsCJALVhWM80yTm52noR8CHMmHzxRc/7H3zyjWiA5cHy5uX+izFn2DvWy13AlKvPPytyGYQhGUSxH6MCWxH57TQ2O95U6ZHkERQAIoC7dMUf2GH AQBT4PVV MMIf72PQl5NqMflsG470+GepWE89uiwbshHtdvYeZbY8utus3dvf6Z1IUB91aSWGmJSDXmV51EvXswKShPDPsKW+RJCVj+EFBPbreX44WIK44vcud9XsosmpLnEqpsh0ruWQNq8nXA+EnEuTL+GJc/IEAjH4JEa8fYgnMovxcWTuH/ME3pLcSMfe94bggAA0QpIh2 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: From: Alexei Starovoitov There are various users of get_vm_area() + ioremap_page_range() APIs. Enforce that get_vm_area() was requested as VM_IOREMAP type and range passed to ioremap_page_range() matches created vm_area to avoid accidentally ioremap-ing into wrong address range. Reviewed-by: Christoph Hellwig Signed-off-by: Alexei Starovoitov --- mm/vmalloc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d12a17fc0c17..f42f98a127d5 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -307,8 +307,21 @@ static int vmap_range_noflush(unsigned long addr, unsigned long end, int ioremap_page_range(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { + struct vm_struct *area; int err; + area = find_vm_area((void *)addr); + if (!area || !(area->flags & VM_IOREMAP)) { + WARN_ONCE(1, "vm_area at addr %lx is not marked as VM_IOREMAP\n", addr); + return -EINVAL; + } + if (addr != (unsigned long)area->addr || + (void *)end != area->addr + get_vm_area_size(area)) { + WARN_ONCE(1, "ioremap request [%lx,%lx) doesn't match vm_area [%lx, %lx)\n", + addr, end, (long)area->addr, + (long)area->addr + get_vm_area_size(area)); + return -ERANGE; + } err = vmap_range_noflush(addr, end, phys_addr, pgprot_nx(prot), ioremap_max_page_shift); flush_cache_vmap(addr, end);