Re: [PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

Re: [PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

[Kefeng Wang]

On 2021/7/30 14:49, Liang Wang wrote:
> The physical address may exceed 32 bits on ARM(when ARM_LPAE enabled),
> use PFN_PHYS() in devmem_is_allowed(), or the physical address may
> overflow and be truncated.
>
> This bug was initially introduced from v2.6.37, and the function was moved
> to lib when v5.10.
>
> Fixes: 087aaffcdf9c ("ARM: implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem")
> Fixes: 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
> Cc: stable@vger.kernel.org # v2.6.37
> Signed-off-by: Liang Wang <wangliang101@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> v2: update subject and changelog
>   lib/devmem_is_allowed.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/devmem_is_allowed.c b/lib/devmem_is_allowed.c
> index c0d67c541849..60be9e24bd57 100644
> --- a/lib/devmem_is_allowed.c
> +++ b/lib/devmem_is_allowed.c
> @@ -19,7 +19,7 @@
>    */
>   int devmem_is_allowed(unsigned long pfn)
>   {
> -	if (iomem_is_exclusive(pfn << PAGE_SHIFT))
> +	if (iomem_is_exclusive(PFN_PHYS(pfn)))
>   		return 0;
>   	if (!page_is_ram(pfn))
>   		return 1;

Re: [PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

[Palmer Dabbelt]

On Fri, 30 Jul 2021 00:04:05 PDT (-0700), wangkefeng.wang@huawei.com wrote:
>
> On 2021/7/30 14:49, Liang Wang wrote:
>> The physical address may exceed 32 bits on ARM(when ARM_LPAE enabled),
>> use PFN_PHYS() in devmem_is_allowed(), or the physical address may
>> overflow and be truncated.
>>
>> This bug was initially introduced from v2.6.37, and the function was moved
>> to lib when v5.10.
>>
>> Fixes: 087aaffcdf9c ("ARM: implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem")
>> Fixes: 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
>> Cc: stable@vger.kernel.org # v2.6.37
>> Signed-off-by: Liang Wang <wangliang101@huawei.com>
> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
>> ---
>> v2: update subject and changelog
>>   lib/devmem_is_allowed.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/devmem_is_allowed.c b/lib/devmem_is_allowed.c
>> index c0d67c541849..60be9e24bd57 100644
>> --- a/lib/devmem_is_allowed.c
>> +++ b/lib/devmem_is_allowed.c
>> @@ -19,7 +19,7 @@
>>    */
>>   int devmem_is_allowed(unsigned long pfn)
>>   {
>> -	if (iomem_is_exclusive(pfn << PAGE_SHIFT))
>> +	if (iomem_is_exclusive(PFN_PHYS(pfn)))
>>   		return 0;
>>   	if (!page_is_ram(pfn))
>>   		return 1;

Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>

I only see the reply so I'm assuming this is going in through some other 
tree, but LMK if you want it via the RISC-V tree as IIRC we're using it 
too.

Thanks!

Re: [PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

[Kefeng Wang]

On 2021/8/4 8:20, Palmer Dabbelt wrote:
> On Fri, 30 Jul 2021 00:04:05 PDT (-0700), wangkefeng.wang@huawei.com 
> wrote:
>>
>> On 2021/7/30 14:49, Liang Wang wrote:
>>> The physical address may exceed 32 bits on ARM(when ARM_LPAE enabled),
>>> use PFN_PHYS() in devmem_is_allowed(), or the physical address may
>>> overflow and be truncated.
>>>
>>> This bug was initially introduced from v2.6.37, and the function was 
>>> moved
>>> to lib when v5.10.
>>>
>>> Fixes: 087aaffcdf9c ("ARM: implement CONFIG_STRICT_DEVMEM by 
>>> disabling access to RAM via /dev/mem")
>>> Fixes: 527701eda5f1 ("lib: Add a generic version of 
>>> devmem_is_allowed()")
>>> Cc: stable@vger.kernel.org # v2.6.37
>>> Signed-off-by: Liang Wang <wangliang101@huawei.com>
>> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
>>> ---
>>> v2: update subject and changelog
>>>   lib/devmem_is_allowed.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
...
> Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>
>
> I only see the reply so I'm assuming this is going in through some 
> other tree, but LMK if you want it via the RISC-V tree as IIRC we're 
> using it too.

Hi Palmer,  there is a v3 with changelog updated,

https://lore.kernel.org/lkml/20210731025057.78825-1-wangliang101@huawei.com/


>
> Thanks!
> .
>

Re: [PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

[Luis Chamberlain]

On Fri, Jul 30, 2021 at 03:43:15PM +0800, Liang Wang wrote:
> The physical address may exceed 32 bits on ARM(when ARM_LPAE enabled),
> use PFN_PHYS() in devmem_is_allowed(),

First off, good catch!

This should not be ARM specific, this should just say:

on 32-bit systems with more than 32 bits of physcial address

Also, towards then end then explain that in practice, yes,
this is probably just ARM which is affected. By explaining
this, it ensures folks are aware of the affected systems.

May be good to refer to commit 947d0496cf3e1 ("generic: make PFN_PHYS
explicitly return phys_addr_t") which added the original PFN_PHYS()
casting to phys_addr_t to resolve the same problem.

> or the physical address may overflow and be truncated.

Indeed. How did you find this issue? Can you describe that in the commit
log? Was it a real world issue or did you do just code inspection? Or
was there a bot which helped you?

> This bug was initially introduced from v2.6.37, and the function was moved
> to lib when v5.11.
> 
> Fixes: 087aaffcdf9c ("ARM: implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem")
> Fixes: 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
> Cc: stable@vger.kernel.org # v2.6.37
> Signed-off-by: Liang Wang <wangliang101@huawei.com>

Other than that:

Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>

  Luis

[PATCH v2] lib: Use PFN_PHYS() in devmem_is_allowed()

[Liang Wang]

The physical address may exceed 32 bits on ARM(when ARM_LPAE enabled),
use PFN_PHYS() in devmem_is_allowed(), or the physical address may
overflow and be truncated.

This bug was initially introduced from v2.6.37, and the function was moved
to lib when v5.11.

Fixes: 087aaffcdf9c ("ARM: implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem")
Fixes: 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
Cc: stable@vger.kernel.org # v2.6.37
Signed-off-by: Liang Wang <wangliang101@huawei.com>
---
v2: update subject and changelog
 lib/devmem_is_allowed.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/devmem_is_allowed.c b/lib/devmem_is_allowed.c
index c0d67c541849..60be9e24bd57 100644
--- a/lib/devmem_is_allowed.c
+++ b/lib/devmem_is_allowed.c
@@ -19,7 +19,7 @@
  */
 int devmem_is_allowed(unsigned long pfn)
 {
-	if (iomem_is_exclusive(pfn << PAGE_SHIFT))
+	if (iomem_is_exclusive(PFN_PHYS(pfn)))
 		return 0;
 	if (!page_is_ram(pfn))
 		return 1;
-- 
2.32.0