All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] acpi, nfit: fix acpi_nfit_flush_probe() crash
@ 2017-02-02 18:53 ` Dan Williams
  0 siblings, 0 replies; 4+ messages in thread
From: Dan Williams @ 2017-02-02 18:53 UTC (permalink / raw)
  To: linux-nvdimm; +Cc: Vishal Verma, stable, linux-acpi

We queue an on-stack work item to 'nfit_wq' and wait for it to complete
as part of a 'flush_probe' request. However, if the user cancels the
wait we need to make sure the item is flushed from the queue otherwise
we are leaving an out-of-scope stack address on the work list.

 BUG: unable to handle kernel paging request at ffffbcb3c72f7cd0
 IP: [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
 [..]
 RIP: 0010:[<ffffffffa9413a7b>]  [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
 RSP: 0018:ffffbcb3c7ba7c00  EFLAGS: 00010046
 [..]
 Call Trace:
  [<ffffffffa90bb11a>] insert_work+0x3a/0xc0
  [<ffffffffa927fdda>] ? seq_open+0x5a/0xa0
  [<ffffffffa90bb30a>] __queue_work+0x16a/0x460
  [<ffffffffa90bbb08>] queue_work_on+0x38/0x40
  [<ffffffffc0cf2685>] acpi_nfit_flush_probe+0x95/0xc0 [nfit]
  [<ffffffffc0cf25d0>] ? nfit_visible+0x40/0x40 [nfit]
  [<ffffffffa9571495>] wait_probe_show+0x25/0x60
  [<ffffffffa9546b30>] dev_attr_show+0x20/0x50

Fixes: 7ae0fa439faf ("nfit, libnvdimm: async region scrub workqueue")
Cc: <stable@vger.kernel.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/acpi/nfit/core.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 2f82b8eba360..7361d00818e2 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
 	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
 	struct device *dev = acpi_desc->dev;
 	struct acpi_nfit_flush_work flush;
+	int rc;
 
 	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
 	device_lock(dev);
@@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
 	INIT_WORK_ONSTACK(&flush.work, flush_probe);
 	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);
 	queue_work(nfit_wq, &flush.work);
-	return wait_for_completion_interruptible(&flush.cmp);
+
+	rc = wait_for_completion_interruptible(&flush.cmp);
+	cancel_work_sync(&flush.work);
+	return rc;
 }
 
 static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] acpi, nfit: fix acpi_nfit_flush_probe() crash
@ 2017-02-02 18:53 ` Dan Williams
  0 siblings, 0 replies; 4+ messages in thread
From: Dan Williams @ 2017-02-02 18:53 UTC (permalink / raw)
  To: linux-nvdimm; +Cc: stable, linux-acpi

We queue an on-stack work item to 'nfit_wq' and wait for it to complete
as part of a 'flush_probe' request. However, if the user cancels the
wait we need to make sure the item is flushed from the queue otherwise
we are leaving an out-of-scope stack address on the work list.

 BUG: unable to handle kernel paging request at ffffbcb3c72f7cd0
 IP: [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
 [..]
 RIP: 0010:[<ffffffffa9413a7b>]  [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
 RSP: 0018:ffffbcb3c7ba7c00  EFLAGS: 00010046
 [..]
 Call Trace:
  [<ffffffffa90bb11a>] insert_work+0x3a/0xc0
  [<ffffffffa927fdda>] ? seq_open+0x5a/0xa0
  [<ffffffffa90bb30a>] __queue_work+0x16a/0x460
  [<ffffffffa90bbb08>] queue_work_on+0x38/0x40
  [<ffffffffc0cf2685>] acpi_nfit_flush_probe+0x95/0xc0 [nfit]
  [<ffffffffc0cf25d0>] ? nfit_visible+0x40/0x40 [nfit]
  [<ffffffffa9571495>] wait_probe_show+0x25/0x60
  [<ffffffffa9546b30>] dev_attr_show+0x20/0x50

Fixes: 7ae0fa439faf ("nfit, libnvdimm: async region scrub workqueue")
Cc: <stable@vger.kernel.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/acpi/nfit/core.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 2f82b8eba360..7361d00818e2 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
 	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
 	struct device *dev = acpi_desc->dev;
 	struct acpi_nfit_flush_work flush;
+	int rc;
 
 	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
 	device_lock(dev);
@@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
 	INIT_WORK_ONSTACK(&flush.work, flush_probe);
 	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);
 	queue_work(nfit_wq, &flush.work);
-	return wait_for_completion_interruptible(&flush.cmp);
+
+	rc = wait_for_completion_interruptible(&flush.cmp);
+	cancel_work_sync(&flush.work);
+	return rc;
 }
 
 static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,

_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] acpi, nfit: fix acpi_nfit_flush_probe() crash
  2017-02-02 18:53 ` Dan Williams
@ 2017-02-02 20:34   ` Vishal Verma
  -1 siblings, 0 replies; 4+ messages in thread
From: Vishal Verma @ 2017-02-02 20:34 UTC (permalink / raw)
  To: Dan Williams; +Cc: linux-nvdimm, stable, linux-acpi

On 02/02, Dan Williams wrote:
> We queue an on-stack work item to 'nfit_wq' and wait for it to complete
> as part of a 'flush_probe' request. However, if the user cancels the
> wait we need to make sure the item is flushed from the queue otherwise
> we are leaving an out-of-scope stack address on the work list.
> 
>  BUG: unable to handle kernel paging request at ffffbcb3c72f7cd0
>  IP: [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
>  [..]
>  RIP: 0010:[<ffffffffa9413a7b>]  [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
>  RSP: 0018:ffffbcb3c7ba7c00  EFLAGS: 00010046
>  [..]
>  Call Trace:
>   [<ffffffffa90bb11a>] insert_work+0x3a/0xc0
>   [<ffffffffa927fdda>] ? seq_open+0x5a/0xa0
>   [<ffffffffa90bb30a>] __queue_work+0x16a/0x460
>   [<ffffffffa90bbb08>] queue_work_on+0x38/0x40
>   [<ffffffffc0cf2685>] acpi_nfit_flush_probe+0x95/0xc0 [nfit]
>   [<ffffffffc0cf25d0>] ? nfit_visible+0x40/0x40 [nfit]
>   [<ffffffffa9571495>] wait_probe_show+0x25/0x60
>   [<ffffffffa9546b30>] dev_attr_show+0x20/0x50
> 
> Fixes: 7ae0fa439faf ("nfit, libnvdimm: async region scrub workqueue")
> Cc: <stable@vger.kernel.org>
> Cc: Vishal Verma <vishal.l.verma@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  drivers/acpi/nfit/core.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Looks good to me.
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>

> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 2f82b8eba360..7361d00818e2 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
>  	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
>  	struct device *dev = acpi_desc->dev;
>  	struct acpi_nfit_flush_work flush;
> +	int rc;
>  
>  	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
>  	device_lock(dev);
> @@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
>  	INIT_WORK_ONSTACK(&flush.work, flush_probe);
>  	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);
>  	queue_work(nfit_wq, &flush.work);
> -	return wait_for_completion_interruptible(&flush.cmp);
> +
> +	rc = wait_for_completion_interruptible(&flush.cmp);
> +	cancel_work_sync(&flush.work);
> +	return rc;
>  }
>  
>  static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] acpi, nfit: fix acpi_nfit_flush_probe() crash
@ 2017-02-02 20:34   ` Vishal Verma
  0 siblings, 0 replies; 4+ messages in thread
From: Vishal Verma @ 2017-02-02 20:34 UTC (permalink / raw)
  To: Dan Williams; +Cc: linux-acpi, stable, linux-nvdimm

On 02/02, Dan Williams wrote:
> We queue an on-stack work item to 'nfit_wq' and wait for it to complete
> as part of a 'flush_probe' request. However, if the user cancels the
> wait we need to make sure the item is flushed from the queue otherwise
> we are leaving an out-of-scope stack address on the work list.
> 
>  BUG: unable to handle kernel paging request at ffffbcb3c72f7cd0
>  IP: [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
>  [..]
>  RIP: 0010:[<ffffffffa9413a7b>]  [<ffffffffa9413a7b>] __list_add+0x1b/0xb0
>  RSP: 0018:ffffbcb3c7ba7c00  EFLAGS: 00010046
>  [..]
>  Call Trace:
>   [<ffffffffa90bb11a>] insert_work+0x3a/0xc0
>   [<ffffffffa927fdda>] ? seq_open+0x5a/0xa0
>   [<ffffffffa90bb30a>] __queue_work+0x16a/0x460
>   [<ffffffffa90bbb08>] queue_work_on+0x38/0x40
>   [<ffffffffc0cf2685>] acpi_nfit_flush_probe+0x95/0xc0 [nfit]
>   [<ffffffffc0cf25d0>] ? nfit_visible+0x40/0x40 [nfit]
>   [<ffffffffa9571495>] wait_probe_show+0x25/0x60
>   [<ffffffffa9546b30>] dev_attr_show+0x20/0x50
> 
> Fixes: 7ae0fa439faf ("nfit, libnvdimm: async region scrub workqueue")
> Cc: <stable@vger.kernel.org>
> Cc: Vishal Verma <vishal.l.verma@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  drivers/acpi/nfit/core.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Looks good to me.
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>

> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 2f82b8eba360..7361d00818e2 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
>  	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
>  	struct device *dev = acpi_desc->dev;
>  	struct acpi_nfit_flush_work flush;
> +	int rc;
>  
>  	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
>  	device_lock(dev);
> @@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
>  	INIT_WORK_ONSTACK(&flush.work, flush_probe);
>  	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);
>  	queue_work(nfit_wq, &flush.work);
> -	return wait_for_completion_interruptible(&flush.cmp);
> +
> +	rc = wait_for_completion_interruptible(&flush.cmp);
> +	cancel_work_sync(&flush.work);
> +	return rc;
>  }
>  
>  static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
> 
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-02 20:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-02 18:53 [PATCH] acpi, nfit: fix acpi_nfit_flush_probe() crash Dan Williams
2017-02-02 18:53 ` Dan Williams
2017-02-02 20:34 ` Vishal Verma
2017-02-02 20:34   ` Vishal Verma

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.