From mboxrd@z Thu Jan 1 00:00:00 1970 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 B6345C77B7C for ; Wed, 25 Jun 2025 15:42:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C49D6B0099; Wed, 25 Jun 2025 11:42:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 374D66B00D2; Wed, 25 Jun 2025 11:42:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23C456B00D3; Wed, 25 Jun 2025 11:42:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1006A6B0099 for ; Wed, 25 Jun 2025 11:42:39 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B32DD1D6B9B for ; Wed, 25 Jun 2025 15:42:38 +0000 (UTC) X-FDA: 83594340396.01.CB36288 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 400FAC0016 for ; Wed, 25 Jun 2025 15:42:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BBObjZMV; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750866156; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=B3iqSsBsPp6drlWzu6Ws1a2bKJ4CuIocvt5EldyW6J0=; b=D2UddtsdcAYHZHxsGaFGjy6EPZpR97ykfvXJTjyysHQtfX0bIr/kqPhlOm4JfLOQteidMw XOzMghhl1WnKa+OpK9kMLDMs5YDxlPg7oADXOmU2rPiorhD4AQqf3XgU/2k8DKknSpZzQr dKZAeUXtlMcMao9OgB9lFgno9Q2DEtM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750866156; a=rsa-sha256; cv=none; b=U0nnZTaJIMleNCukWPiIMB0FE/Z078wVxGTtf03/R810KT34oSlbNGP5Gjh9AbzVENJ8KY S40BtqIEVfoAnYk4QB6sCsvsZq++0qNaNPRvo1Hd6ykT7feNrA6S2ODyVXB9tdyhgVu92s 6MU8XaE9N8OiZ4ynm8QeuLLOyzxhYEM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BBObjZMV; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750866155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=B3iqSsBsPp6drlWzu6Ws1a2bKJ4CuIocvt5EldyW6J0=; b=BBObjZMVMhk416WlNBW3SqxY7m+iDTyPLY/wjAKYMsZIGsp+lbxxjpaz1szL0W/CRm7HJN Dq1rmU/i+8FtapOWQRy4cAjkHUPvZawwqAuWRWT9dNepC7DVqmZRTLZFLEv9y5OEVR27OL 24Msf58N0ysxRQDyZ+ZjytYnj9HSa5Y= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-282--suVyNTxPG-Vn3ruYJR6FA-1; Wed, 25 Jun 2025 11:42:34 -0400 X-MC-Unique: -suVyNTxPG-Vn3ruYJR6FA-1 X-Mimecast-MFC-AGG-ID: -suVyNTxPG-Vn3ruYJR6FA_1750866153 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-451d3f03b74so11117705e9.3 for ; Wed, 25 Jun 2025 08:42:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750866153; x=1751470953; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=B3iqSsBsPp6drlWzu6Ws1a2bKJ4CuIocvt5EldyW6J0=; b=U97vQ0deC8NMZshkhqgoa8sd3sER8wnEPhDzmDMYL5T0/vlYs84EmewFjR8i3c6HtH zstQMuOCHYlFBo8BWSF6pPptISxYVe3aToYk7hiYT+GlcSz7/fGXJKZHd86Ue7PgcMUq EzsI/svFr193Kd+PkSvaQqvLyOchtQqOIbuV2YOXkdaRTwcUt/GytIt/0Zq1vI6uIfT4 +7dHGk06Hg7lIDSKLjuUAXAjfugkm8JLMmTsrN4tFLwm0/brU8KyD9jp73UoSDa+Lf1+ W55hGdVlEhQr9A0bcvdevztrFtnAQlC7Zt7JCN8MyXg/Sdgt0iv+RExft1a+0DnkICyA BNHQ== X-Forwarded-Encrypted: i=1; AJvYcCXmPrG/dgfF/IE3UZ7Rrlno8nqFhnAjsd7RgpeubmGEKmBFRt2WMGQA7BkgqMZ1mNMCpq8//V7A+g==@kvack.org X-Gm-Message-State: AOJu0YzzYxPvj3n66oxtCceAuSRe6iQLsrw8XwPQWcL4nqGsPKLbSi6F prnITvKAQv/6Yk89ZTAJER+4P+pc7MF7gn55IXpg+o0vD42IMBS7WMciohbsT/UdHkPymVp3mvx Le3L+fqzwpgsc2cgIvdNoVHIxOlS9uIFdLg32j0ltzZAZmUy1XFqL X-Gm-Gg: ASbGncsK8xB5ndxmv0MMgJzDynBik2U3TLoLCWVfDZK0CkGVoeN83XhITOkxUwntPsa 4T9is+mkdLpJdOieuosseKPDLG1KFstOO7LcRGe6O/waS7lsfaOVj7UPfIPPoIsI4Ob7iUuf38h QgaeqC53nY/OPHdHkZy8kqj+Hu9KONH5t82yM3FUKSdA8xTrT+a52lBNV1hCRXE98BBUdFk2KWQ SrrnjRg8PwiUHSFVvBXDnRYy9QJu16Ez1li+Nwt7ijEuaZSFyDujKmfyAsX4xBmyhvqmjk5UAsr zadBh5FY8OrygNf/QoxiK5pKUqow0czJ1uN4Eck+1n9KCIdCloUyzM6B/N2xyts6TnoGrclJyxM PQ5PWVqVAm3q2ZDaf1TRTuSjqJIgx63neOa5eN4Qk2fuZ X-Received: by 2002:a05:600c:a07:b0:453:6424:48a2 with SMTP id 5b1f17b1804b1-45381ab0482mr38563895e9.10.1750866152841; Wed, 25 Jun 2025 08:42:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHR5g2IxgPUMS2neGXiPrv1p0KYziAZ5jgdrYuhuFvBuEr6gtBPRkqPB6PBShAzdaU2h5xwmA== X-Received: by 2002:a05:600c:a07:b0:453:6424:48a2 with SMTP id 5b1f17b1804b1-45381ab0482mr38563665e9.10.1750866152437; Wed, 25 Jun 2025 08:42:32 -0700 (PDT) Received: from ?IPV6:2003:d8:2f12:1b00:5d6b:db26:e2b7:12? (p200300d82f121b005d6bdb26e2b70012.dip0.t-ipconnect.de. [2003:d8:2f12:1b00:5d6b:db26:e2b7:12]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e80f2526sm1970526f8f.52.2025.06.25.08.42.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Jun 2025 08:42:31 -0700 (PDT) Message-ID: Date: Wed, 25 Jun 2025 17:42:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Fix do_pages_stat to use compat_uptr_t To: Christoph Berg , Andrew Morton , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , "open list:MEMORY MANAGEMENT - MEMORY POLICY AND MIGRATION" , open list References: From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JV2zEJtt18PSU9gOdi3NfZb_B_EBfdUR2Bat1_OHyEo_1750866153 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 400FAC0016 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: rr3bk7e5jwh8mbrub4r1zbuuhsj1n4kt X-HE-Tag: 1750866156-718022 X-HE-Meta: U2FsdGVkX18+bRLBtOytI6vkgAkbq5cgm7IqS+qy7shf05geRLIBF02JW13VfOenp6odODkSY/N5H5wsZ9Bo1kHUvB9xpSlymOG2UAtxPlMjQMXXO62mbZ+7l2qTGDVmk2IcrayaaNFJsmLihX1pvihDaNG8cvgOlRNcNE0XfMutuD+4lHwgi87MylmR4Tpl56cAWQGUjPYxXz+LibIN70B/D3hL6Tz+5dgDNH71IM5eEhrYGiMaq509pGceLVHapZkXHZSI4PzJFvDM7eglGBBFP2QHNwYiWbU50VYULTX50s546av2BrP0w7eGGa+b6rlSm+Ku7bFvn8MnCbHKqlUrlxmHs/+qLyVbXqNWUe9vfU3Z+CTe2hcXoUrJAKUcRgNNy3X47bF/hDyZl4cW7etc2i5wFvZVQabbpkO9UhYON0ZYiAqZwFe+tbMoftSVOdUhmE8IF6Pc6LyFjjmAGESQLbKW2E6psNWJQg0JH0gm0GoJCTlr5dGu8/8m0ssKxY8jbjbVYizYd27zjbjL1FWiSx4PTZec7fAliwFUd4y3acOkSjpIipWGBO1IC8mrECvtmAEP39dz7EY+VJmmTLtmxtantVD6uT7IbqsKsFmHUHxET/Jyqu1rdKcGgQ8TFAuw0pBFAkH+BCO7+0hRQIUS1b4dYhN4Otgd+ZVVMxqa9CJuYvdWSz57SWVkuMUTrDyAPeADvUiy8aDXJywwDzfKhCMHaP/oOjjx0u4QV3JTCCKqECGdkakNGq3excSkN5BjDp9r5kS9GRupYn99RNq0qaYV3ZAQAQdFUHqLgzDqdmHis+ROIZ/iPl0AwSNLdDaEi20SXsxozlP7ETEFUu3qC2i1YMvOn28nrcYhyBt/l3hE6aDIRUuJe+iGRRmFL1CAeQ3VAs38Z3TByRiaFD7PQRo0HXvrQ7qd5yDudahJ91fIhl7cgrW6t2O+U7RMtAe3cDgD9JGTRX1vuNQ 6CIr9v9J UiTHd6GjYmzxM1EIaJ7J94DCJp4Q63JxxPakpKtbWGLXb/4OGvno0YxliY2zzykJGzDVny4tBejGkAou7vBWFLy/lUBjjS5PgEEfzOiMK9JrjUDR8X/I9PCatKYY7FkO7c5lh3UoZFtzcka/3/VDPg1kO/y+sO+d5Du7PR25tXVRQTIFEjHSKKfn0vNVb/7ziUGplHtS1ORIX/g1gmDeTH5SAUEZEIp1QcaplLct/stPiA0LBFFtrwdhIDPf4h2Po+8st1KynUcjggHR6uRmRArxCHYe+b2EtUHOZKworFnLpRDdXa/nRWJr7LI+w02BJaogyCuFgfza+ZeYgrh7YneqJe5kVBkAcEnKQAcMk8fpCZ+KMBPOCl7AVc/UFe3JbHuKsyabB0scgKTweWHaIPRsspDeWWbUPYhit76gyx1bd1jyP4X4njkhyh0jkZMhAkkHMQ5jFPtqdCV+O2M0Qp16YzJqZ/0987FDU7lHvt+EwSBo4nmMjY9SjSVBtcMhc1E0Bm/0c74UiaSn7Zb4tQYgRaHivHE2J/IxS2MHhssw7G3drti3ODmYJOFDES1HohJfGMY/Hw5nZm2RrR2/gn/J4MzJz7FiZeXTTO2GWd/Xho2cYL2Kcwp7H7oY/vsYVH4gkpB6yYgHNc7qrbc084oCl1P3gOil9+XZJ 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: On 25.06.25 17:24, Christoph Berg wrote: Subject should start with "mm/migrate:" > For arrays with more than 16 entries, the old code would incorrectly > advance the pages pointer by 16 words instead of 16 compat_uptr_t. > > Signed-off-by: Christoph Berg > Suggested-by: Bertrand Drouvot Likely we want a Fixes: and then this is probably "Reported-by:" paired with a "Closes:" link to any such report. But I'm wondering how long this has already been like that. :) > --- > mm/migrate.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 8cf0f9c9599..542c81ec3ed 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -2444,7 +2444,13 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, > if (copy_to_user(status, chunk_status, chunk_nr * sizeof(*status))) > break; > > - pages += chunk_nr; > + if (in_compat_syscall()) { > + compat_uptr_t __user *pages32 = (compat_uptr_t __user *)pages; > + > + pages32 += chunk_nr; > + pages = (const void __user * __user *) pages32; > + } else > + pages += chunk_nr; > status += chunk_nr; > nr_pages -= chunk_nr; > } Something a bit more elegant might be: diff --git a/mm/migrate.c b/mm/migrate.c index ea8c74d996592..fc99448771041 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2398,6 +2398,7 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, static int get_compat_pages_array(const void __user *chunk_pages[], const void __user * __user *pages, + unsigned long chunk_offs, unsigned long chunk_nr) { compat_uptr_t __user *pages32 = (compat_uptr_t __user *)pages; @@ -2405,7 +2406,7 @@ static int get_compat_pages_array(const void __user *chunk_pages[], int i; for (i = 0; i < chunk_nr; i++) { - if (get_user(p, pages32 + i)) + if (get_user(p, pages32 + i + chunk_offs)) return -EFAULT; chunk_pages[i] = compat_ptr(p); } @@ -2424,13 +2425,14 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, #define DO_PAGES_STAT_CHUNK_NR 16UL const void __user *chunk_pages[DO_PAGES_STAT_CHUNK_NR]; int chunk_status[DO_PAGES_STAT_CHUNK_NR]; + unsigned long chunk_offs = 0; while (nr_pages) { unsigned long chunk_nr = min(nr_pages, DO_PAGES_STAT_CHUNK_NR); if (in_compat_syscall()) { if (get_compat_pages_array(chunk_pages, pages, - chunk_nr)) + chunk_offs, chunk_nr)) break; } else { if (copy_from_user(chunk_pages, pages, @@ -2440,11 +2442,11 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages, do_pages_stat_array(mm, chunk_nr, chunk_pages, chunk_status); - if (copy_to_user(status, chunk_status, chunk_nr * sizeof(*status))) + if (copy_to_user(status + chunk_offs, chunk_status, + chunk_nr * sizeof(*status))) break; - pages += chunk_nr; - status += chunk_nr; + chunk_offs += chunk_nr; nr_pages -= chunk_nr; } return nr_pages ? -EFAULT : 0; (untested, of course) -- Cheers, David / dhildenb