U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Fuzzey <martin.fuzzey@flowbird.group>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] w1: fix data abort if no one wire bus master present
Date: Mon, 22 Oct 2018 18:31:08 +0200	[thread overview]
Message-ID: <1540225879-17841-2-git-send-email-martin.fuzzey@flowbird.group> (raw)
In-Reply-To: <1540225879-17841-1-git-send-email-martin.fuzzey@flowbird.group>

When the "w1 bus" command is used with no bus master present
a data abort may occur.

This is because uclass_first_device() returns zero, but sets the output
struct udevice pointer to NULL in the no device found case.

Fix w1_get_bus() to account for this and return an error code
as is expected by the callers.

Signed-off-by: Martin Fuzzey <martin.fuzzey@flowbird.group>
---
 drivers/w1/w1-uclass.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index aecf7fe..cb41b68 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -115,17 +115,19 @@ int w1_get_bus(int busnum, struct udevice **busp)
 	struct udevice *dev;
 
 	for (ret = uclass_first_device(UCLASS_W1, &dev);
-	     !ret;
-	     uclass_next_device(&dev), i++) {
-		if (ret) {
-			debug("Cannot find w1 bus %d\n", busnum);
-			return ret;
-		}
+	     dev && !ret;
+	     ret = uclass_next_device(&dev), i++) {
 		if (i == busnum) {
 			*busp = dev;
 			return 0;
 		}
 	}
+
+	if (!ret) {
+		debug("Cannot find w1 bus %d\n", busnum);
+		ret = -ENODEV;
+	}
+
 	return ret;
 }
 
-- 
1.9.1

  reply	other threads:[~2018-10-22 16:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-22 16:31 [U-Boot] [PATCH] w1-eeprom: ds24xxx: fix data abort in ds24xxx_probe() Martin Fuzzey
2018-10-22 16:31 ` Martin Fuzzey [this message]
2018-10-23  7:05   ` [U-Boot] [PATCH] w1: fix data abort if no one wire bus master present Eugen.Hristev at microchip.com
2018-10-23  8:17     ` Martin Fuzzey
2018-10-23  8:30       ` Eugen.Hristev at microchip.com
2018-11-02 20:29   ` [U-Boot] " Tom Rini
2018-10-23  6:51 ` [U-Boot] [PATCH] w1-eeprom: ds24xxx: fix data abort in ds24xxx_probe() Eugen.Hristev at microchip.com
2018-11-02 20:29 ` [U-Boot] " Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1540225879-17841-2-git-send-email-martin.fuzzey@flowbird.group \
    --to=martin.fuzzey@flowbird.group \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox