From patchwork Mon Jul 1 17:48:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13718494 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 564F81649BF; Mon, 1 Jul 2024 17:48:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719856091; cv=none; b=Wyqj1yk0hdbc6dgGKpDAjAXW7lKxJJbe+UWbFhqQQoPT/vdQVPnqmlgR2PJMFJOdjD4FJOn9vYjaAYHzyYOTHVsG5FLhWcBq76J6GECC548+l9/OiwVUdDEgfU7CskX64VwwPpr4JlGNlljWZRWjzd+qHqa7UfJUi9Xr9Koe9yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719856091; c=relaxed/simple; bh=KaH8oQNKC2J+JbJiecogG+d2lkZRfkZprOTkDkcmMME=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VU1zimpaDZV04+XgUY8AwadyfVWVxVCoki3xyyhjvgCabN6NCGqJZ3D1BE0GkjY/xiHXGk+tcaYBydZ8XyevaQvP+O50zFhjzAwCUL/y/+6QbCxeqd7Bsfoy8yOvOWnyOfmcOmnkjxrBguYkQDvHUuMVgU14bN0ss5iDDZAStqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JTlR11Z3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JTlR11Z3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D7DFC116B1; Mon, 1 Jul 2024 17:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719856089; bh=KaH8oQNKC2J+JbJiecogG+d2lkZRfkZprOTkDkcmMME=; h=From:To:Cc:Subject:Date:From; b=JTlR11Z3vOzVWgjESAvFRce5NH8+OcWnKAfBj7vbmDanIPrM/sUpbNpmek+sVO0bT uW4CS3aWvOC7fb88eYKjAP06LN865mcwXQ41hmWLnj9z8rUs8fXIwdYRWdZThVbswC jub4pkOis0IiXzHnSp2zkzofD2uyG3Se7MLjaJd7qzw8GXKpDxHRwqFtE9mpMz/Cxf PMOo5yeXGUOsBB9Sv7gT8mcmk5OxuvYOsPTSsdFj+hzkrA9lxfar6Yov77+bVhgIo8 vTJxn2SzqufaVYLQUKIT6/BRJMBdGrQrodC3bZDhZl2EP+Q6zgjgPF/OSFB7BJPkDB 533lcLLASM2hA== From: Andrii Nakryiko To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, adobriyan@gmail.com, Andrii Nakryiko , Arnd Bergmann , Stephen Rothwell Subject: [PATCH v2 1/2] fs/procfs: fix integer to pointer cast warning in do_procmap_query() Date: Mon, 1 Jul 2024 10:48:04 -0700 Message-ID: <20240701174805.1897344-1-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On 32-bit architectures compiler will complain about casting __u64 to void * pointer: fs/proc/task_mmu.c: In function 'do_procmap_query': fs/proc/task_mmu.c:598:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 598 | if (karg.vma_name_size && copy_to_user((void __user *)karg.vma_name_addr, | ^ fs/proc/task_mmu.c:605:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 605 | if (karg.build_id_size && copy_to_user((void __user *)karg.build_id_addr, | ^ Fix this by using u64_to_user_ptr() helper that's meant to handle this properly. Suggested-by: Arnd Bergmann Reported-by: Stephen Rothwell Fixes: df789ce1eb90 ("fs/procfs: add build ID fetching to PROCMAP_QUERY API") Fixes: 3757be498749 ("fs/procfs: implement efficient VMA querying API for /proc//maps") Signed-off-by: Andrii Nakryiko --- fs/proc/task_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d99a390a0f41..3f1d0d2f78fe 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -595,14 +595,14 @@ static int do_procmap_query(struct proc_maps_private *priv, void __user *uarg) query_vma_teardown(mm, vma); mmput(mm); - if (karg.vma_name_size && copy_to_user((void __user *)karg.vma_name_addr, + if (karg.vma_name_size && copy_to_user(u64_to_user_ptr(karg.vma_name_addr), name, karg.vma_name_size)) { kfree(name_buf); return -EFAULT; } kfree(name_buf); - if (karg.build_id_size && copy_to_user((void __user *)karg.build_id_addr, + if (karg.build_id_size && copy_to_user(u64_to_user_ptr(karg.build_id_addr), build_id_buf, karg.build_id_size)) return -EFAULT; From patchwork Mon Jul 1 17:48:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13718495 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8054316EBF7; Mon, 1 Jul 2024 17:48:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719856093; cv=none; b=F6VdVlBzrYD6R2XqZ8mhFnhda8WJG8PLTEi6tKmkoWQI5P7IknZt7pRo34spfz7xW0WIEMkRkzgnHnukeyRUgOdMbRjQC9uMi4fgM+OV5sfOTFGfLg50Xf5E3h4BIynScQZbXjSUDjcLdW8QkyBGIOxWxG1iGYXvYwmkBIooTXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719856093; c=relaxed/simple; bh=vClrN8Cgz91Pyp8b4riGZaG1H0hvRxtBooe+ewQkcqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s+cgbsFc6tNr0mLB0JPXj+q0vj7EkkLi4IJE7RGo4rcRZBKcZUOQkU6z7+4r2OIV9bPubrpyeLgQ6Q7BLXwf8copWZZWqItPZ5+4i0MBjIkFLdbEfx0VtkSBQpS05p09aDJSiGlWhWv87CVVtNBe4z552PnAA54Ao15UYazSGtU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pRBHaRTd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pRBHaRTd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2E24C4AF0A; Mon, 1 Jul 2024 17:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719856093; bh=vClrN8Cgz91Pyp8b4riGZaG1H0hvRxtBooe+ewQkcqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pRBHaRTdyqI4Pp5Y/yc6w73ARTYOtRfRkHODvDLacSQU8DXg5IqqKNeCjQ7n3Xa90 DjItfOERvdhm8d/MkL4MSeAMMQcDdOQxm7hm/WOXwcVfHgtqOTPyQBoI6i67kDcfcU J66uRbX6RQkj/pBFD6TczR+Wrq1n7UctUssaf4OkwPZTCkQlYw5zoELi5QhR/UV9DN cSLvU5VKtPLiY9k2sCIOpUS8SgQEujAZK5tNUPNR8+5ArPiTnggUIQK840hF9eiLdP 5lZRbPWN2Xya4e8wyFHc9vKc8P/6iB4bMQMonqZ+wLAvsvG6ZbB7ExvCwgWwPEKbIs S7qt8NJMlML9A== From: Andrii Nakryiko To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, adobriyan@gmail.com, Andrii Nakryiko , Arnd Bergmann , Stephen Rothwell Subject: [PATCH v2 2/2] fs/procfs: improve PROCMAP_QUERY's compat mode handling Date: Mon, 1 Jul 2024 10:48:05 -0700 Message-ID: <20240701174805.1897344-2-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240701174805.1897344-1-andrii@kernel.org> References: <20240701174805.1897344-1-andrii@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Kernel provides compat_ptr_ioctl() wrapper to sanitize pointers for 32-bit processes on 64-bit host architectures. Given procfs_procmap_ioctl() always expects pointer argument, this is exactly what we need. This has any effect only on 32-bit processes on s390 architecture. Suggested-by: Arnd Bergmann Fixes: 3757be498749 ("fs/procfs: implement efficient VMA querying API for /proc//maps") Signed-off-by: Andrii Nakryiko --- fs/proc/task_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 3f1d0d2f78fe..b7bb4d04e962 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -637,7 +637,7 @@ const struct file_operations proc_pid_maps_operations = { .llseek = seq_lseek, .release = proc_map_release, .unlocked_ioctl = procfs_procmap_ioctl, - .compat_ioctl = procfs_procmap_ioctl, + .compat_ioctl = compat_ptr_ioctl, }; /*