/dev/mem: Fix wrong error on accessing beyond valid memory addresses.
PATCH 1/1 /dev/mem: Fix wrong error on accessing beyond valid memory addresses.
Currently this returns -EFAULT, but it really should be returning 0, as in - 0 bytes read or written. This is what you would get by opening a block device, seeking to the end, and trying to read something. Additionally, make lseek() check the sought-to offset to pass the valid_phys_addr_range test.
--- drivers/char/mem.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/char/mem.c +7 -2
@@ -98,7 +98,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,char *ptr;if (!valid_phys_addr_range (p, count)) -return -EFAULT ; +return 0 ; read =0 ;#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */
@@ -156,7 +156,7 @@ static ssize_t write_mem(struct file *file, const char __user *buf,void *ptr;if (!valid_phys_addr_range (p, count)) -return -EFAULT ; +return 0 ; written =0 ;
@@ -710,6 +710,11 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)case SEEK_CUR : offset += file->f_pos;case SEEK_SET : +if (!valid_phys_addr_range (offset,0 )) { + ret = -EINVAL ; +break ; + } +/* to avoid userland mistaking f_pos=-9 as -EBADF=-9 */ if ((unsigned long long )offset >= ~0xFFFULL ) { ret = -EOVERFLOW ;
Signature · 1 line
1.7.4.1
Hi Peter,
----- Original Message -----
Quoted 12 lines
From: "Andrei Warkentin" <[email protected]>
To: [email protected]
Cc: "Andrei Warkentin" <[email protected]>, "H. Peter Anvin" <[email protected]>
Sent: Wednesday, November 9, 2011 6:31:19 PM
Subject: [PATCH]/dev/mem: Fix wrong error on accessing beyond valid memory addresses.Currently this returns
-EFAULT, but it really should be returning 0, as in - 0 bytes read or written. This is what you would get by opening a block device, seeking to the end, and trying to read something. Additionally, makelseek()check the sought-to offset to pass thevalid_phys_addr_rangetest.
Quoted 3 lines
Cc H. Peter Anvin <[email protected]>Signed-off-by Andrei Warkentin <[email protected]>---
I know you're very busy, but I was wondering if you could give your two cents on this change. This change grew from our discussion on LKML last week.
Thanks ahead,
A
Quoted 7 lines · Andrei Warkentin
I know you're very busy, but I was wondering if you could give your two cents on this change. This change grew from our discussion on LKML last week.
Thanks ahead,
A
EOF seems wrong to me (not as bad as EFAULT, but still wrong).
-hpa
Hi Peter,
----- Original Message -----
Quoted 8 lines
From: "H. Peter Anvin" <[email protected]>
To: "Andrei Warkentin" <[email protected]>
Cc: [email protected]
Sent: Monday, November 14, 2011 4:59:58 PM
Subject: Re: [PATCH]/dev/mem: Fix wrong error on accessing beyond valid memory addresses.Quoted 1 line · Andrei Warkentin
Quoted 8 lines
Quoted 6 lines
I know you're very busy, but I was wondering if you could give your two cents on this change. This change grew from our discussion on LKML last week.
Thanks ahead,
AEOF seems wrong to me (not as bad as EFAULT, but still wrong).
Although that was what we had discussed, I do not return -EOF in the patch. As you mention - that would be wrong. I played around with other devices (block, actually), and if you attempt to read(2) beyond the end, read(2) simply returns 0, as in zero bytes read out. Of course, lseek(2) beyond the end should return -EINVAL, as well, so that is what that patch I CCd you on accomplishes.
A
Quoted 9 lines · Andrei Warkentin
Quoted 2 lines
EOF seems wrong to me (not as bad as EFAULT, but still wrong).
Although that was what we had discussed, I do not return
-EOFin the patch. As you mention - that would be wrong. I played around with other devices (block, actually), and if you attempt to read(2) beyond the end, read(2) simply returns 0, as in zero bytes read out. Of course, lseek(2) beyond the end should return-EINVAL, as well, so that is what that patch I CCd you on accomplishes.
0 is EOF.
This is not a block device -- comparing to block devices is pointless. There is no "end" to /dev/mem, so this is a totally meaningless comparison.
-hpa
Hi,
----- Original Message -----
Quoted 21 lines
From: "H. Peter Anvin" <[email protected]>
To: "Andrei Warkentin" <[email protected]>
Cc: [email protected]
Sent: Monday, November 14, 2011 5:12:35 PM
Subject: Re: [PATCH]/dev/mem: Fix wrong error on accessing beyond valid memory addresses.Quoted 13 lines · Andrei Warkentin
Quoted 2 lines
EOF seems wrong to me (not as bad as EFAULT, but still wrong).
Although that was what we had discussed, I do not return
-EOFin the patch. As you
mention - that would be wrong. I played around with other devices (block, actually),
and if you attempt to read(2) beyond the end, read(2) simply returns 0, as in
zero bytes read out. Of course, lseek(2) beyond the end should return-EINVAL, as
well, so that is what that patch I CCd you on accomplishes.
Quoted 2 lines
0 is EOF.
Ah, whoops, silly me.
Quoted 4 lines
This is not a block device -- comparing to block devices is pointless.
There is no "end" to/dev/mem, so this is a totally meaningless comparison.
Oh ok, I looked at other arches, like IA64, and now see why using valid_phys_addr_range as an "end" test is meaningless.
Thanks,
A