Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1307971 > unrolled thread

[PATCH] locktorture: Fix NULL pointer when torture_type is invalid

Started byKefeng Wang <wangkefeng.wang@huawei.com>
First post2016-01-13 03:10 +0100
Last post2016-01-14 02:50 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] locktorture: Fix NULL pointer when torture_type is invalid Kefeng Wang <wangkefeng.wang@huawei.com> - 2016-01-13 03:10 +0100
    Re: [PATCH] locktorture: Fix NULL pointer when torture_type is  invalid "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2016-01-13 17:30 +0100
      Re: [PATCH] locktorture: Fix NULL pointer when torture_type is  invalid Kefeng Wang <wangkefeng.wang@huawei.com> - 2016-01-14 02:50 +0100

#1307971 — [PATCH] locktorture: Fix NULL pointer when torture_type is invalid

FromKefeng Wang <wangkefeng.wang@huawei.com>
Date2016-01-13 03:10 +0100
Subject[PATCH] locktorture: Fix NULL pointer when torture_type is invalid
Message-ID<qQj2O-1jj-3@gated-at.bofh.it>
Insmod locktorture with torture_type=mutex will lead to crash,

Unable to handle kernel NULL pointer dereference at virtual address 00000008
pgd = ffffffc0f6c10000
[00000008] *pgd=000000013b221003, *pud=000000013b221003, *pmd=0000000000000000
Internal error: Oops: 94000006 [#1] PREEMPT SMP
Modules linked in: locktorture(+) torture
CPU: 2 PID: 1462 Comm: insmod Not tainted 4.4.0+ #19
Hardware name: linux,dummy-virt (DT)
task: ffffffc0fb2b3700 ti: ffffffc0fa938000 task.ti: ffffffc0fa938000
PC is at __torture_print_stats+0x18/0x180 [locktorture]
LR is at lock_torture_stats_print+0x68/0x110 [locktorture]
pc : [<ffffffbffc017028>] lr : [<ffffffbffc017500>] pstate: 60000145
sp : ffffffc0fa93bb20
[snip...]
Call trace:
[<ffffffbffc017028>] __torture_print_stats+0x18/0x180 [locktorture]
[<ffffffbffc017500>] lock_torture_stats_print+0x68/0x110 [locktorture]
[<ffffffbffc0180fc>] lock_torture_cleanup+0xc4/0x278 [locktorture]
[<ffffffbffc01d144>] lock_torture_init+0x144/0x5b0 [locktorture]
[<ffffffc000082940>] do_one_initcall+0x94/0x1a0
[<ffffffc000141888>] do_init_module+0x60/0x1c8
[<ffffffc00011c628>] load_module+0x1880/0x1c9c
[<ffffffc00011cc00>] SyS_finit_module+0x7c/0x88
[<ffffffc000085cb0>] el0_svc_naked+0x24/0x28

Fix it by check stats_task in lock_torture_cleanup() to guard not into
a wrong path.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 kernel/locking/locktorture.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 8ef1919..1afa8ad 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -764,8 +764,10 @@ static void lock_torture_cleanup(void)
 		reader_tasks = NULL;
 	}
 
-	torture_stop_kthread(lock_torture_stats, stats_task);
-	lock_torture_stats_print();  /* -After- the stats thread is stopped! */
+	if (stats_task) {
+		torture_stop_kthread(lock_torture_stats, stats_task);
+		lock_torture_stats_print();  /* -After- the stats thread is stopped! */
+	}
 
 	if (atomic_read(&cxt.n_lock_torture_errors))
 		lock_torture_print_module_parms(cxt.cur_ops,
-- 
1.7.12.4

[toc] | [next] | [standalone]


#1308572 — Re: [PATCH] locktorture: Fix NULL pointer when torture_type is invalid

From"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date2016-01-13 17:30 +0100
SubjectRe: [PATCH] locktorture: Fix NULL pointer when torture_type is invalid
Message-ID<qQwt5-2jv-37@gated-at.bofh.it>
In reply to#1307971
On Wed, Jan 13, 2016 at 10:06:22AM +0800, Kefeng Wang wrote:
> Insmod locktorture with torture_type=mutex will lead to crash,
> 
> Unable to handle kernel NULL pointer dereference at virtual address 00000008
> pgd = ffffffc0f6c10000
> [00000008] *pgd=000000013b221003, *pud=000000013b221003, *pmd=0000000000000000
> Internal error: Oops: 94000006 [#1] PREEMPT SMP
> Modules linked in: locktorture(+) torture
> CPU: 2 PID: 1462 Comm: insmod Not tainted 4.4.0+ #19
> Hardware name: linux,dummy-virt (DT)
> task: ffffffc0fb2b3700 ti: ffffffc0fa938000 task.ti: ffffffc0fa938000
> PC is at __torture_print_stats+0x18/0x180 [locktorture]
> LR is at lock_torture_stats_print+0x68/0x110 [locktorture]
> pc : [<ffffffbffc017028>] lr : [<ffffffbffc017500>] pstate: 60000145
> sp : ffffffc0fa93bb20
> [snip...]
> Call trace:
> [<ffffffbffc017028>] __torture_print_stats+0x18/0x180 [locktorture]
> [<ffffffbffc017500>] lock_torture_stats_print+0x68/0x110 [locktorture]
> [<ffffffbffc0180fc>] lock_torture_cleanup+0xc4/0x278 [locktorture]
> [<ffffffbffc01d144>] lock_torture_init+0x144/0x5b0 [locktorture]
> [<ffffffc000082940>] do_one_initcall+0x94/0x1a0
> [<ffffffc000141888>] do_init_module+0x60/0x1c8
> [<ffffffc00011c628>] load_module+0x1880/0x1c9c
> [<ffffffc00011cc00>] SyS_finit_module+0x7c/0x88
> [<ffffffc000085cb0>] el0_svc_naked+0x24/0x28
> 
> Fix it by check stats_task in lock_torture_cleanup() to guard not into
> a wrong path.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

Good catch!  One question below...

> ---
>  kernel/locking/locktorture.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
> index 8ef1919..1afa8ad 100644
> --- a/kernel/locking/locktorture.c
> +++ b/kernel/locking/locktorture.c
> @@ -764,8 +764,10 @@ static void lock_torture_cleanup(void)
>  		reader_tasks = NULL;
>  	}
> 
> -	torture_stop_kthread(lock_torture_stats, stats_task);
> -	lock_torture_stats_print();  /* -After- the stats thread is stopped! */
> +	if (stats_task) {
> +		torture_stop_kthread(lock_torture_stats, stats_task);
> +		lock_torture_stats_print();  /* -After- the stats thread is stopped! */
> +	}

Does it work to have the following?

+	if (stats_task)
+		torture_stop_kthread(lock_torture_stats, stats_task);
+	lock_torture_stats_print();  /* -After- the stats thread is stopped! */

We need to print the statistics at the end of the run, even if we chose
not to print them periodically throughout the run.

							Thanx, Paul

>  	if (atomic_read(&cxt.n_lock_torture_errors))
>  		lock_torture_print_module_parms(cxt.cur_ops,
> -- 
> 1.7.12.4
> 

[toc] | [prev] | [next] | [standalone]


#1308949 — Re: [PATCH] locktorture: Fix NULL pointer when torture_type is invalid

FromKefeng Wang <wangkefeng.wang@huawei.com>
Date2016-01-14 02:50 +0100
SubjectRe: [PATCH] locktorture: Fix NULL pointer when torture_type is invalid
Message-ID<qQFcZ-8cO-1@gated-at.bofh.it>
In reply to#1308572
Hi paul,

On 2016/1/14 0:27, Paul E. McKenney wrote:
> On Wed, Jan 13, 2016 at 10:06:22AM +0800, Kefeng Wang wrote:
>> Insmod locktorture with torture_type=mutex will lead to crash,
>>
>> Unable to handle kernel NULL pointer dereference at virtual address 00000008
>> pgd = ffffffc0f6c10000
>> [00000008] *pgd=000000013b221003, *pud=000000013b221003, *pmd=0000000000000000
>> Internal error: Oops: 94000006 [#1] PREEMPT SMP
>> Modules linked in: locktorture(+) torture
>> CPU: 2 PID: 1462 Comm: insmod Not tainted 4.4.0+ #19
>> Hardware name: linux,dummy-virt (DT)
>> task: ffffffc0fb2b3700 ti: ffffffc0fa938000 task.ti: ffffffc0fa938000
>> PC is at __torture_print_stats+0x18/0x180 [locktorture]
>> LR is at lock_torture_stats_print+0x68/0x110 [locktorture]
>> pc : [<ffffffbffc017028>] lr : [<ffffffbffc017500>] pstate: 60000145
>> sp : ffffffc0fa93bb20
>> [snip...]
>> Call trace:
>> [<ffffffbffc017028>] __torture_print_stats+0x18/0x180 [locktorture]
>> [<ffffffbffc017500>] lock_torture_stats_print+0x68/0x110 [locktorture]
>> [<ffffffbffc0180fc>] lock_torture_cleanup+0xc4/0x278 [locktorture]
>> [<ffffffbffc01d144>] lock_torture_init+0x144/0x5b0 [locktorture]
>> [<ffffffc000082940>] do_one_initcall+0x94/0x1a0
>> [<ffffffc000141888>] do_init_module+0x60/0x1c8
>> [<ffffffc00011c628>] load_module+0x1880/0x1c9c
>> [<ffffffc00011cc00>] SyS_finit_module+0x7c/0x88
>> [<ffffffc000085cb0>] el0_svc_naked+0x24/0x28
>>
>> Fix it by check stats_task in lock_torture_cleanup() to guard not into
>> a wrong path.
>>
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> 
> Good catch!  One question below...
> 
>> ---
>>  kernel/locking/locktorture.c | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
>> index 8ef1919..1afa8ad 100644
>> --- a/kernel/locking/locktorture.c
>> +++ b/kernel/locking/locktorture.c
>> @@ -764,8 +764,10 @@ static void lock_torture_cleanup(void)
>>  		reader_tasks = NULL;
>>  	}
>>
>> -	torture_stop_kthread(lock_torture_stats, stats_task);
>> -	lock_torture_stats_print();  /* -After- the stats thread is stopped! */
>> +	if (stats_task) {
>> +		torture_stop_kthread(lock_torture_stats, stats_task);
>> +		lock_torture_stats_print();  /* -After- the stats thread is stopped! */
>> +	}
> 
> Does it work to have the following?
> 
> +	if (stats_task)
> +		torture_stop_kthread(lock_torture_stats, stats_task);
> +	lock_torture_stats_print();  /* -After- the stats thread is stopped! */
> 
> We need to print the statistics at the end of the run, even if we chose
> not to print them periodically throughout the run.
> 

No, the pc is in __torture_print_stats(char *page, struct lock_stress_stats *statp, bool write),
that is 'long min = statp[0].n_lock_acquired;', if the torture_type is invalid, the statp is NULL,
because the cxt.lwsa and cxt.lwsa/cxt.lrsa are not initialized in lock_torture_init().

Thanks,
Kefeng

> 							Thanx, Paul
> 
>>  	if (atomic_read(&cxt.n_lock_torture_errors))
>>  		lock_torture_print_module_parms(cxt.cur_ops,
>> -- 
>> 1.7.12.4
>>
> 
> 
> .
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web