diff mbox

lib/genalloc: fix gen_pool_virt_to_phys locking

Message ID 1311664741-21336-1-git-send-email-leoy@marvell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Leo Yan July 26, 2011, 7:19 a.m. UTC
The func gen_pool_virt_to_phys will iterate the chunk list;
if find the correct chunk it should need release pool's lock.

Signed-off-by: Leo Yan <leoy@marvell.com>
---
 lib/genalloc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

real mz July 28, 2011, 10:39 a.m. UTC | #1
this fix seems already on next tree

http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=lib/genalloc.c;h=f352cc42f4f8a58b8e4c8304de32cb31b4e29b67;hb=HEAD


On Tue, Jul 26, 2011 at 3:19 PM, Leo Yan <leoy@marvell.com> wrote:
> The func gen_pool_virt_to_phys will iterate the chunk list;
> if find the correct chunk it should need release pool's lock.
>
> Signed-off-by: Leo Yan <leoy@marvell.com>
> ---
>  lib/genalloc.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/lib/genalloc.c b/lib/genalloc.c
> index 577ddf8..e625df5 100644
> --- a/lib/genalloc.c
> +++ b/lib/genalloc.c
> @@ -92,8 +92,10 @@ phys_addr_t gen_pool_virt_to_phys(struct gen_pool *pool, unsigned long addr)
>        list_for_each(_chunk, &pool->chunks) {
>                chunk = list_entry(_chunk, struct gen_pool_chunk, next_chunk);
>
> -               if (addr >= chunk->start_addr && addr < chunk->end_addr)
> +               if (addr >= chunk->start_addr && addr < chunk->end_addr) {
> +                       read_unlock(&pool->lock);
>                        return chunk->phys_addr + addr - chunk->start_addr;
> +               }
>        }
>        read_unlock(&pool->lock);
>
> --
> 1.7.4.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Leo Yan July 29, 2011, 2:25 a.m. UTC | #2
real mz,

You are right. :-) it's long time not see you guy.
For i am developed based on mainline, so if without this
patch, then the kernel will panic.

Best regards,
Leo Yan


On 2011?07?28? 18:39, real mz wrote:
> this fix seems already on next tree
>
> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=lib/genalloc.c;h=f352cc42f4f8a58b8e4c8304de32cb31b4e29b67;hb=HEAD
>
>
> On Tue, Jul 26, 2011 at 3:19 PM, Leo Yan<leoy@marvell.com>  wrote:
>> The func gen_pool_virt_to_phys will iterate the chunk list;
>> if find the correct chunk it should need release pool's lock.
>>
>> Signed-off-by: Leo Yan<leoy@marvell.com>
>> ---
>>   lib/genalloc.c |    4 +++-
>>   1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/lib/genalloc.c b/lib/genalloc.c
>> index 577ddf8..e625df5 100644
>> --- a/lib/genalloc.c
>> +++ b/lib/genalloc.c
>> @@ -92,8 +92,10 @@ phys_addr_t gen_pool_virt_to_phys(struct gen_pool *pool, unsigned long addr)
>>         list_for_each(_chunk,&pool->chunks) {
>>                 chunk = list_entry(_chunk, struct gen_pool_chunk, next_chunk);
>>
>> -               if (addr>= chunk->start_addr&&  addr<  chunk->end_addr)
>> +               if (addr>= chunk->start_addr&&  addr<  chunk->end_addr) {
>> +                       read_unlock(&pool->lock);
>>                         return chunk->phys_addr + addr - chunk->start_addr;
>> +               }
>>         }
>>         read_unlock(&pool->lock);
>>
>> --
>> 1.7.4.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
diff mbox

Patch

diff --git a/lib/genalloc.c b/lib/genalloc.c
index 577ddf8..e625df5 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -92,8 +92,10 @@  phys_addr_t gen_pool_virt_to_phys(struct gen_pool *pool, unsigned long addr)
 	list_for_each(_chunk, &pool->chunks) {
 		chunk = list_entry(_chunk, struct gen_pool_chunk, next_chunk);
 
-		if (addr >= chunk->start_addr && addr < chunk->end_addr)
+		if (addr >= chunk->start_addr && addr < chunk->end_addr) {
+			read_unlock(&pool->lock);
 			return chunk->phys_addr + addr - chunk->start_addr;
+		}
 	}
 	read_unlock(&pool->lock);