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 60394C77B71 for ; Sat, 15 Apr 2023 10:14:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD5956B0072; Sat, 15 Apr 2023 06:14:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A85BA6B0075; Sat, 15 Apr 2023 06:14:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94D8A6B0078; Sat, 15 Apr 2023 06:14:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 857976B0072 for ; Sat, 15 Apr 2023 06:14:14 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3CF7BA0200 for ; Sat, 15 Apr 2023 10:14:14 +0000 (UTC) X-FDA: 80683215228.30.D61E508 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf20.hostedemail.com (Postfix) with ESMTP id 62BF21C000B for ; Sat, 15 Apr 2023 10:14:12 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=BHtiDOmC; spf=pass (imf20.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@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=1681553652; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Wp4YF3nuXkkMv51GOsaMipzQK0xp4qUusETg3DPFN8g=; b=o9JYVAg+9kJU8L1tAse6h/p8vrlpq5wAqZaiqw/xA4V6mZ/eE2dk8cs+qosuwajP20GqNo THLiP6S73kjNRlJvpbf8l9v7+eNvFHi/6XmJbQ6Bl3PPW0Np/7zFRKqlR4HiW/Dbw/Xyod G7qOaUtNpqVgyuKKRvSy3S+w93u6d3E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=BHtiDOmC; spf=pass (imf20.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681553652; a=rsa-sha256; cv=none; b=8jbf2CHqZaX6oBBVBm5zN3sm4OM945KPcXxT0YCyX+M4zRhZE7mfO93xJAxmY4fBckVUEb pDFXU6cfS6QqjbquqPHy18hiTPZa0NRI7Pj7gY8qjqhZK9cHz83yMHtkRlmYyR/e8d4S2w 6Nwo670203yVDww7zgm/d4hAPDnuH68= Received: by mail-wm1-f45.google.com with SMTP id o6-20020a05600c4fc600b003ef6e6754c5so9263254wmq.5 for ; Sat, 15 Apr 2023 03:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681553651; x=1684145651; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Wp4YF3nuXkkMv51GOsaMipzQK0xp4qUusETg3DPFN8g=; b=BHtiDOmCoIbmYqc+lRKC9AGbsuXXPVL59n4uKYjY2OHzdHn8LVXDunshclHU+Cg1Dc OxHlZ3AY7JngwWJZYDOykxe9onYS69uQFcAJ21iNUfrforTNYjP5sN/81R9irXmZjhEa +bBkv8UfBLUMLAkJgUCEO9IhX8e8oxVjQYMUp12QpQmOdfDwbj3uZ31qEZ1fwG6CHdo9 0qoUmYQ3ZINuIF5ytA5YGCU27dVvy2pcxBk2AMVSHHP0QXY6RYy1idnT1voA31bTfLKH AL+P4a6Z3grgQNZbfrXQS/BIrYwyAGVGRATaQ7FsG3KR4ncnHaFnxAMV21Cg3w0cQN/0 XNEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681553651; x=1684145651; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Wp4YF3nuXkkMv51GOsaMipzQK0xp4qUusETg3DPFN8g=; b=Z7zvYU7MPSVTXZi7BSHbQTTI7F735U6GXLeDjmKcr7feLczMb3I6q5F1vO4lTzclWh /yUa+Q93SBJaK9t6Wja3gRNChFXAQ18SVGEnKdYS9GwvcrVHcujN5RDo3kZhbfh/s/Tt duW9Z1YvgCeBKaU4q1c4i70NC/ySAW0KHJ0CT6SrIC0BJJzi1dVn1Bs4PHl5t4gxZbFZ g4j7OHZ91OoDwdgIgcLYpt2HHywQx9F1msh8PssF7WzpDdbRdtY9qWQ3TW9CoJTW81hS BuT7RHARCvWputpneHDISGNsjFB4Wp+c7H6O9zXXgbrHpWp4tRpNnnnVMqS2X4AJooUg EJNw== X-Gm-Message-State: AAQBX9f7N5zHzOk4zO2Bv7ecNDnCHasZwHVGWddKSSFZAP1twtIcH/PO SpQsE45etvSk87E6iScXoHw= X-Google-Smtp-Source: AKy350ZnRrIEAh9ODFGhrLIHMBWqoSdQAdDh4IPJYB3zTYwrbrzYWGdPLDKWsYqgnJv2+0ZnF7Eyxg== X-Received: by 2002:a7b:ce89:0:b0:3f1:6788:a4b4 with SMTP id q9-20020a7bce89000000b003f16788a4b4mr1364773wmj.33.1681553650758; Sat, 15 Apr 2023 03:14:10 -0700 (PDT) Received: from localhost ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.gmail.com with ESMTPSA id a1-20020a05600c224100b003f072b22dbbsm6272869wmm.16.2023.04.15.03.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 03:14:09 -0700 (PDT) Date: Sat, 15 Apr 2023 11:14:08 +0100 From: Lorenzo Stoakes To: Tetsuo Handa Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/7] mm/gup: remove vmas parameter from get_user_pages_remote() Message-ID: <63d92734-2185-439c-bbc7-53a4720f5d4a@lucifer.local> References: <631001ecc556c5e348ff4f47719334c31f7bd592.1681547405.git.lstoakes@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 62BF21C000B X-Stat-Signature: 7fgucnb8tjrn59nozy4pywen593p7igd X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1681553652-331242 X-HE-Meta: U2FsdGVkX19MCULpCyxqbwGRCIjt7HV4bDDEbvv589pkQh2wZRTt0QYBbRpStvoiHF3Z0iCY/X9dd2cZonp27EiI9Qi88AtacnXJgrODJCr5i9hgFNZr9h0Kr2sIUPhgmm2gxz0T6U56m/BQVky/c/92iddMUTOW8rqbu0iML+Lcn3Q9j6jxeKBqTCguaZQci46b1Se2XSClBT+su0MKniYcEiiYK3f5LlMF9w7EjUWlGwOUBuz3GIp1eddQ1uPzQeQQGF1g9/yvpKxrzI5oJgIrgks85Wxkm7lmkAuns6QQ9xGBlUet1Tlq4mAZpcKiMAjSqSr3yhF8Y7lV05xCzEV/7RU15QO448UMnFovgyDZqNWccXlkDTPBH9zXiNTPpKuIVVra2oEnblVtHCRgHHQ4KOZikPHb0LyCWt0YuJoejEC6+Ijc55MkJD/mYyKW6rBYeghEWoFcp5YakHsjU0cUg1ZwaDFUowUK31swWDdYWd7F/LICklDVlSJpFUnqhAyvLJcQs5FfHKFBoe3NTlviIBk6AFSyQ9uU35sfeh1xXV5N6y12qgjahLt6OzqBv2/uu/JXA1ccTevL9zTEvuLe7DR1sPlFKBzwMNBVLKdfKJzCs0kYIKCavX0hTOehyGIoKcbFpT+WPR3U5BORrNC514xfAe/ftCULBRS7fyzwBo2mfY75DlkUybPrcCtqHeoiPipj6+J6XWE2DzTXGbj7+F3sAx01lmEuKH23CpKpdIB7jFJlOWh3jcPdbvOot++VapSUwWQil2onczmGp9AStftY7sgJ+IluTZbfVI/gdHtqzNSQV5cONj+iS8WbB1Tgw++dc+56jUSionfQTp0Lije7In8+dykXTZ9DAVTJAbMj4LyjPvqvms4vXIHnfh7+qKlmHFIIl9pAZNc/MtvZgoM+emkoSttlEQVXLaQcoObF9t0kwr7D5j8y5Cs60nh8ZjdbBeqZXcEF45Q 6hbMTzP+ wel0f+efcTyCWQsbrqDgSDXVK5yIK6DLhOtKWxH6dQ3BZ87zvjffrmE41WfMFNZUZr9Jf41GlAXWgIcVI55HAgioF5JoFrG5MSu5nEwS2MBD5HkeU21NW1nd3BawprJY7/3yOfN+VAzznxbe5tfAwh2627YAbyJektp6DIngW+22YBxV5q1EKJe/ysu5SKsUXMWGwQagIolBQNuosVCGdNcDiDrAPXcz12nVy0d32fP4CPk0Dg11wBuREtcWtXzspY2YboVrrwoUROOjweGOr7/mAz6QPnWTMTjzYm2cp6i9H3zPJBMKnrqoL4itvjJS2vVbDI0ib818uU5HA6nX8N2s1CW35d1J99AjuYJdcxHqMMVh1dr0tfAGBdmPtWlBU4LETIPvc3dSi3s2dQL5KRiZR617NwEPwmlePQBHj8CGXdL7a6JRc7UNxibwApHfvjgEnMPWwe4Ni/4zOiNziLe9N5JsdvwCqVrEIeI8KhjgDmmA= 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: On Sat, Apr 15, 2023 at 06:52:41PM +0900, Tetsuo Handa wrote: > On 2023/04/15 18:08, Lorenzo Stoakes wrote: > > @@ -475,10 +474,14 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, > > gup_flags |= FOLL_SPLIT_PMD; > > /* Read the page with vaddr into memory */ > > ret = get_user_pages_remote(mm, vaddr, 1, gup_flags, > > - &old_page, &vma, NULL); > > + &old_page, NULL); > > if (ret <= 0) > > return ret; > > > > + vma = vma_lookup(mm, vaddr); > > + if (!vma) > > + goto put_old; > > + > > ret = verify_opcode(old_page, vaddr, &opcode); > > if (ret <= 0) > > goto put_old; > > This conversion looks wrong. > This causes returning a positive number when vma_lookup() returned NULL. > > * Return 0 (success) or a negative errno. > In reality it shouldn't be possible for vma to return NULL, I'm adding the checks to be extra careful. In any case you're right, attaching a -fix patch to avoid spam:- ----8<---- >From 0710d01ea69ad4e846fa1e56a40b253ff59714ac Mon Sep 17 00:00:00 2001 From: Lorenzo Stoakes Date: Sat, 15 Apr 2023 11:09:15 +0100 Subject: [PATCH] mm/gup: remove vmas parameter from get_user_pages_remote() Correct vma NULL check as indicated by Tetsuo. Signed-off-by: Lorenzo Stoakes --- kernel/events/uprobes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index b21993cd2dcc..affe42a13eff 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -479,8 +479,10 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, return ret; vma = vma_lookup(mm, vaddr); - if (!vma) + if (!vma) { + ret = -EINVAL; goto put_old; + } ret = verify_opcode(old_page, vaddr, &opcode); if (ret <= 0) -- 2.40.0