Subject: [merged] procfs-fix-unintended-truncation-of-returned-mapped-address.patch removed from -mm tree
To: d.hatayama@xxxxxxxxxxxxxx,adobriyan@xxxxxxxxx,davem@xxxxxxxxxxxxx,holzheu@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 17 Oct 2013 11:13:25 -0700
The patch titled
Subject: procfs: fix unintended truncation of returned mapped address
has been removed from the -mm tree. Its filename was
procfs-fix-unintended-truncation-of-returned-mapped-address.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: HATAYAMA Daisuke <d.hatayama@xxxxxxxxxxxxxx>
Subject: procfs: fix unintended truncation of returned mapped address
Currently, proc_reg_get_unmapped_area truncates upper 32-bit of the mapped
virtual address returned from get_unmapped_area method in pde->proc_fops
due to the variable rv of signed integer on x86_64. This is too small to
have vitual address of unsigned long on x86_64 since on x86_64, signed
integer is of 4 bytes while unsigned long is of 8 bytes. To fix this
issue, use unsigned long instead.
Fixes a regression added in c4fe24485729 ("sparc: fix PCI device proc file
mmap(2)").
Signed-off-by: HATAYAMA Daisuke <d.hatayama@xxxxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Tested-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/proc/inode.c~procfs-fix-unintended-truncation-of-returned-mapped-address fs/proc/inode.c
--- a/fs/proc/inode.c~procfs-fix-unintended-truncation-of-returned-mapped-address
+++ a/fs/proc/inode.c
@@ -288,7 +288,7 @@ static int proc_reg_mmap(struct file *fi
static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
{
struct proc_dir_entry *pde = PDE(file_inode(file));
- int rv = -EIO;
+ unsigned long rv = -EIO;
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
if (use_pde(pde)) {
get_unmapped_area = pde->proc_fops->get_unmapped_area;
_
Patches currently in -mm which might be from d.hatayama@xxxxxxxxxxxxxx are
origin.patch
procfs-clean-up-proc_reg_get_unmapped_area-for-80-column-limit.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
