All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
To: gupt21@gmail.com, jikos@kernel.org,
	benjamin.tissoires@redhat.com, Enrik.Berkhan@inka.de,
	sven.zuehlsdorf@vigem.de
Cc: linux-i2c@vger.kernel.org, linux-input@vger.kernel.org,
	Hamish Martin <hamish.martin@alliedtelesis.co.nz>
Subject: [PATCH 1/5] HID: mcp2221: Set driver data before I2C adapter add
Date: Wed, 25 Oct 2023 16:55:10 +1300	[thread overview]
Message-ID: <20231025035514.3450123-2-hamish.martin@alliedtelesis.co.nz> (raw)
In-Reply-To: <20231025035514.3450123-1-hamish.martin@alliedtelesis.co.nz>

The process of adding an I2C adapter can invoke I2C accesses on that new
adapter (see i2c_detect()).

Ensure we have set the adapter's driver data to avoid null pointer
dereferences in the xfer functions during the adapter add.

This has been noted in the past and the same fix proposed but not
completed. See:
https://lore.kernel.org/lkml/ef597e73-ed71-168e-52af-0d19b03734ac@vigem.de/

Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
---
 drivers/hid/hid-mcp2221.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/hid-mcp2221.c b/drivers/hid/hid-mcp2221.c
index 72883e0ce757..b95f31cf0fa2 100644
--- a/drivers/hid/hid-mcp2221.c
+++ b/drivers/hid/hid-mcp2221.c
@@ -1157,12 +1157,12 @@ static int mcp2221_probe(struct hid_device *hdev,
 	snprintf(mcp->adapter.name, sizeof(mcp->adapter.name),
 			"MCP2221 usb-i2c bridge");
 
+	i2c_set_adapdata(&mcp->adapter, mcp);
 	ret = devm_i2c_add_adapter(&hdev->dev, &mcp->adapter);
 	if (ret) {
 		hid_err(hdev, "can't add usb-i2c adapter: %d\n", ret);
 		return ret;
 	}
-	i2c_set_adapdata(&mcp->adapter, mcp);
 
 #if IS_REACHABLE(CONFIG_GPIOLIB)
 	/* Setup GPIO chip */
-- 
2.42.0


  reply	other threads:[~2023-10-25  3:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-25  3:55 [PATCH 0/5] MCP2221 Improvements Hamish Martin
2023-10-25  3:55 ` Hamish Martin [this message]
2023-10-25  3:55 ` [PATCH 2/5] HID: mcp2221: Allow IO to start during probe Hamish Martin
2023-10-25  3:55 ` [PATCH 3/5] HID: mcp2221: Set ACPI companion Hamish Martin
2023-10-25  3:55 ` [PATCH 4/5] HID: mcp2221: Don't set bus speed on every transfer Hamish Martin
2023-10-25  3:55 ` [PATCH 5/5] HID: mcp2221: Handle reads greater than 60 bytes Hamish Martin
2023-11-21  8:31 ` [PATCH 0/5] MCP2221 Improvements Jiri Kosina

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=20231025035514.3450123-2-hamish.martin@alliedtelesis.co.nz \
    --to=hamish.martin@alliedtelesis.co.nz \
    --cc=Enrik.Berkhan@inka.de \
    --cc=benjamin.tissoires@redhat.com \
    --cc=gupt21@gmail.com \
    --cc=jikos@kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=sven.zuehlsdorf@vigem.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 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.