From patchwork Fri Nov 17 21:38:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 13459740 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 1DE95C072A2 for ; Fri, 17 Nov 2023 21:38:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8030C8D006B; Fri, 17 Nov 2023 16:38:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B4128D005B; Fri, 17 Nov 2023 16:38:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67AB68D006B; Fri, 17 Nov 2023 16:38:54 -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 542D88D005B for ; Fri, 17 Nov 2023 16:38:54 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 30B45120DE4 for ; Fri, 17 Nov 2023 21:38:54 +0000 (UTC) X-FDA: 81468761388.03.6B61017 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf15.hostedemail.com (Postfix) with ESMTP id 62B51A0011 for ; Fri, 17 Nov 2023 21:38:52 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=osandov-com.20230601.gappssmtp.com header.s=20230601 header.b=iKEfiduU; dmarc=none; spf=none (imf15.hostedemail.com: domain of osandov@osandov.com has no SPF policy when checking 209.85.210.174) smtp.mailfrom=osandov@osandov.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700257132; 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:references:dkim-signature; bh=V83WWTjr18Il15OBb68SAB6MSjKGeFK0q0ZpRJpEjKQ=; b=JD3ABlbRpm+6ICNONZ/vy/2zAs3A4RH2MvNA3aHeqZAYuGI5x2aNH8CiHDRdASwZ9ke9HR /Y5wpZlzDDE99O8Rv2xZT+QQS2LE0IpXjEY5s7hs8Qi7h4b2GNFAb+8CDgDwZ4kN8tcwZ5 4PxVEpRrBnNyvypLOjGQ9uXlySqheNI= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=osandov-com.20230601.gappssmtp.com header.s=20230601 header.b=iKEfiduU; dmarc=none; spf=none (imf15.hostedemail.com: domain of osandov@osandov.com has no SPF policy when checking 209.85.210.174) smtp.mailfrom=osandov@osandov.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700257132; a=rsa-sha256; cv=none; b=wLDs+NYmzzQAy5WbQRexd5KVgfFh4QyukvpiEIfz+K1q/Pn/2IQDFh69XuUfsgBfq5Ws6q kIf0AzvGywsy9grtOZ/GLKMgbHDwDD5RJmwqI03aeueJxpCUqK67O2cVjLwtsrTxo0b4Xq qzLEtBNjfpFL9iq+OEgJnV4iOK1W4UU= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6bd73395bceso1883692b3a.0 for ; Fri, 17 Nov 2023 13:38:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20230601.gappssmtp.com; s=20230601; t=1700257131; x=1700861931; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=V83WWTjr18Il15OBb68SAB6MSjKGeFK0q0ZpRJpEjKQ=; b=iKEfiduUTHSR24BPYY92MolLb6UQNGqqTRiWGV16pculPmVSKJXlo20Z6pHuPqiOjq mym8V61e7AOdvvJ+E/QwhwtGx5/GKl4m7ZkoW0S/zmuHJLhWiwV/58ZBUFLRt4Hfzpem 5hICHSQA/ZwsuyVOvH+zR+2tW32o+ks6YHUaD/8uOsi8Ekm4qT8s6HGPKnL1lAd9VqGL 4CkDhbcQ9sbPi94r0fdRvNMuusAY3HU9Qetrc2KOCLFL5hKu0lt34RBoy6sMTbxrUigO J4HFw2eP9QpwDasjqUbN4CyypHtJWZjmMeVaBK5hkEtck5e32SGjbBvbaqRlEbAopFcC Jckw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700257131; x=1700861931; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V83WWTjr18Il15OBb68SAB6MSjKGeFK0q0ZpRJpEjKQ=; b=rTpe66lkmpdJaNrZuWtZ025fWtIuyLyN5+IBrLFJbSgvmHgMKJBpwA6K+0tZG59fjy 8q1bD8+tSggLdEOOcLjtHnGRmc3NPeMKC8iEMU36bI3ZvbDdyj9WTCvTJqIeYlIGyIVc c3/Io5hxCnaJei0EU6cpzlNDp4EUIEGLBcvZSlyPy94JpBAp3gwvTyxOre9yxQ/7W51p OI+wU5VVqHStL+5kuP96KCgk0jP96eR5K9U6VIR7ziWffB2eurpx92a3NjqsWdGIDMW4 bdR+HyLgxUy9XJPVEEofwrYr1hE9ui4G/HMg4Rms4xE9A8ZNubgKvnyx2X8La/M75fKY 0DuA== X-Gm-Message-State: AOJu0YzdG9+fVwkwt6zYwVAp1hGuo30DJXELH+V8IYBQ+hJjYyL6u9ZY pFP5HKj0Y+RShH5vX9wQjf5kCg== X-Google-Smtp-Source: AGHT+IGh6iTOa8ZLG1OgoKz2r5+pUSy+q5808oU4LyF71xppgP6bH04Rter23Y1DP8jdehVuI53XpQ== X-Received: by 2002:a05:6a00:2d04:b0:6c3:3cb0:d85 with SMTP id fa4-20020a056a002d0400b006c33cb00d85mr10085883pfb.0.1700257130842; Fri, 17 Nov 2023 13:38:50 -0800 (PST) Received: from telecaster.hsd1.wa.comcast.net ([2601:602:a300:3bc0::1923]) by smtp.gmail.com with ESMTPSA id f52-20020a056a000b3400b006a7083f9f6esm1844028pfu.23.2023.11.17.13.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:38:50 -0800 (PST) From: Omar Sandoval To: linux-fsdevel@vger.kernel.org, Al Viro , Christian Brauner , David Howells Cc: kernel-team@fb.com, linux-mm@kvack.org Subject: [PATCH] iov_iter: fix copy_page_to_iter_nofault() Date: Fri, 17 Nov 2023 13:38:46 -0800 Message-ID: X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 62B51A0011 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: bifz8reqggn6c1rmw74irx1ksupwpegt X-HE-Tag: 1700257132-628669 X-HE-Meta: U2FsdGVkX1+i6dg3uyfJZTcQbWPCrnxHOaW238hif0bgWoPy/WZ9FTN7VlZJ6XFRPe3aCO3Xssc1bq7ig3JhpIZFdlsc/gBRNUp1cLukWlI/iK2LwqXDw3Td5IC1vhacP6fg+w6Soh36TO9vnmhomlO20KIjhfNNYKOEIHGGEaHEOpTDGkek9YuMbzQdJEDGVX2LSu2ZGzx/WYsRVDSuHQs6FZ39AMmQx/ygir/ZAZPE4h+k+6vnz1RIf55Snx01xkZx5ZIh4PFFGZif0iZnY+SnU7r/EHznWp3/grGuJKa4KNvDL9nQTCmm+DPkDrgIVmsqQojStQLIXLoWIgsdLWkynAUKYXGc9ONR1q1KTHSNlH0sTgNsnak6dx35YXLcneogOHZ6VUGonXaNC5GEcfbN6lw27PTf4ZYS1cC9K2jgtHI8OkJk4Gxet8iUTH5bQMhDPHGLUsb3k27oz1yMh4OvsXKK/q9ufcOkQ6LJfOe4VOGVy+m7sm1xyewhYzO8VQUqHCNunbSOaqVT/tGNn3X9KYzP0WysmgWszxvoj7oxplicB6SxUvxKlkLn4LSve3kP+YTNnTLEl4z9Z3R8na27hHmONm8VNt2qbrmTys9PwmlJFlDCc3AGtOC5r0nwxWXhZOBvRT6qW+dYbU5JaN0hvokpt+Txo6EqWZ8muA3Pu6WSnIQft1I4GgjuLjtJGJKQj/sNUGvCKMbo3gz8KoNDuV88RLyr28eEspbabO8SUV9FkALUmUnrJkoJONLjBsqnd4SoxjKDaOeYefXIjzaTrg7OF1iG1TeQS664P1ghLpkrzUp2HAW5OaL3Lwf3zQ8zQu/227ptCINdSBSEKChZOZPm3gMBd3/PZNMiYSqYSLk99SQ5W+TUrD1SIC0aRIPVKZ4JaJDkHOWA54s0uMD8ov9ylOb0mr3V5xZAw896nH6+XuK3C56C/kD1d9jM6NcEMPpx7BL/j+1GFEP hXshbGFk 23jK/XU/raiyzRX0LsRKeqHOcldSX6PCO81Xzb7gaXwnG1qRi2uwMi8GupzDCzy3kKlPr7OkVfJenUvTa8lA05mYVG0c/7oh58/WV0LRixTnbn4v5GhAzoMCJqna9EMJNg5A3YmWBJ+afDzGs5GGfVY2kRdjYpuurybiTrIBfscyTcXnA2Q09FYWhetcg5IRHDVpj0igZ1xSj2EYJewrX8ZONx7ydO6Vh8O2aDFK2bJtb6MaKW6dfDW5fsNFZPs0RkK8jYmIbjJw6HJC3fw8AUDVJGNtwy8PXbM1ZwjbEkGFErBnhv+Qbj/0Z2Ie2uSkAThyEbA2P/ujzc4hU6P/87i8CqqRlik91aryfCJjMoWIN8yvOb3dKGiu1P29S3MEtDs8SAlNbg1CnSgZ7nDwuRngtn0DXHtSqR1nsSIssCRMX5LwfJOBU6eWFRgeu3I9QokIAieguGeSkwm+/N5utRBN4EQtRUiVFc1MUcBNhjZ9KMIY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.003365, 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: Omar Sandoval The recent conversion to inline functions made two mistakes: 1. It tries to copy the full amount requested (bytes), not just what's available in the kmap'd page (n). 2. It's not applying the offset in the first page. Note that copy_page_to_iter_nofault() is only used by /proc/kcore. This was detected by drgn's test suite. Fixes: f1982740f5e7 ("iov_iter: Convert iterate*() to inline funcs") Signed-off-by: Omar Sandoval Acked-by: David Howells --- lib/iov_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index de7d11cf4c63..8ff6824a1005 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -409,7 +409,7 @@ size_t copy_page_to_iter_nofault(struct page *page, unsigned offset, size_t byte void *kaddr = kmap_local_page(page); size_t n = min(bytes, (size_t)PAGE_SIZE - offset); - n = iterate_and_advance(i, bytes, kaddr, + n = iterate_and_advance(i, n, kaddr + offset, copy_to_user_iter_nofault, memcpy_to_iter); kunmap_local(kaddr);