* [PATCH] Revert "spidev: fix hang when transfer_one_message fails"
@ 2014-01-28 9:33 Geert Uytterhoeven
2014-01-28 17:53 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2014-01-28 9:33 UTC (permalink / raw)
To: Mark Brown, Daniel Santos; +Cc: linux-spi, linux-kernel, Geert Uytterhoeven
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
This reverts commit e120cc0dcf2880a4c5c0a6cb27b655600a1cfa1d.
It causes a NULL pointer dereference with drivers using the generic
spi_transfer_one_message(), which always calls
spi_finalize_current_message(), which zeroes master->cur_msg.
Drivers implementing transfer_one_message() theirselves must always call
spi_finalize_current_message(), even if the transfer failed:
* @transfer_one_message: the subsystem calls the driver to transfer a single
* message while queuing transfers that arrive in the meantime. When the
* driver is finished with this message, it must call
* spi_finalize_current_message() so the subsystem can issue the next
* transfer
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
drivers/spi/spi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index fe18a9d80213..5e43a31ee88a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -745,9 +745,7 @@ static void spi_pump_messages(struct kthread_work *work)
ret = master->transfer_one_message(master, master->cur_msg);
if (ret) {
dev_err(&master->dev,
- "failed to transfer one message from queue: %d\n", ret);
- master->cur_msg->status = ret;
- spi_finalize_current_message(master);
+ "failed to transfer one message from queue\n");
return;
}
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "spidev: fix hang when transfer_one_message fails"
2014-01-28 9:33 [PATCH] Revert "spidev: fix hang when transfer_one_message fails" Geert Uytterhoeven
@ 2014-01-28 17:53 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2014-01-28 17:53 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Daniel Santos, linux-spi, linux-kernel, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
On Tue, Jan 28, 2014 at 10:33:03AM +0100, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
>
> This reverts commit e120cc0dcf2880a4c5c0a6cb27b655600a1cfa1d.
>
> It causes a NULL pointer dereference with drivers using the generic
> spi_transfer_one_message(), which always calls
> spi_finalize_current_message(), which zeroes master->cur_msg.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-28 17:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-28 9:33 [PATCH] Revert "spidev: fix hang when transfer_one_message fails" Geert Uytterhoeven
2014-01-28 17:53 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).