From: Kieran Bingham <kieran@ksquared.org.uk>
To: Wolfram Sang <wsa@the-dreams.de>,
Lee Jones <lee.jones@linaro.org>,
Kieran Bingham <kieran@ksquared.org.uk>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Javier Martinez Canillas <javier@osg.samsung.com>,
sameo@linux.intel.com
Subject: [PATCHv7 01/11] i2c: Add pointer dereference protection to i2c_match_id()
Date: Mon, 7 Nov 2016 12:47:36 +0000 [thread overview]
Message-ID: <1478522866-29620-2-git-send-email-kieran@bingham.xyz> (raw)
In-Reply-To: <1478522866-29620-1-git-send-email-kieran@bingham.xyz>
From: Lee Jones <lee.jones@linaro.org>
Here we're providing dereference protection for i2c_match_id(), which
saves us having to do it each time it's called. We're also stripping
out the (now) needless checks in i2c_device_match(). This patch paves
the way for other, similar code trimming.
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Kieran Bingham <kieran@bingham.xyz>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
---
drivers/i2c/i2c-core.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b432b64e307a..86083e5e5520 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -679,6 +679,9 @@ static inline int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
const struct i2c_client *client)
{
+ if (!(id && client))
+ return NULL;
+
while (id->name[0]) {
if (strcmp(client->name, id->name) == 0)
return id;
@@ -692,8 +695,6 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
struct i2c_client *client = i2c_verify_client(dev);
struct i2c_driver *driver;
- if (!client)
- return 0;
/* Attempt an OF style match */
if (of_driver_match_device(dev, drv))
@@ -704,9 +705,10 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
return 1;
driver = to_i2c_driver(drv);
- /* match on an id table if there is one */
- if (driver->id_table)
- return i2c_match_id(driver->id_table, client) != NULL;
+
+ /* Finally an I2C match */
+ if (i2c_match_id(driver->id_table, client))
+ return 1;
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-11-07 12:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 12:47 [PATCHv7 00/11] i2c: Relax mandatory I2C ID table passing Kieran Bingham
2016-11-07 12:47 ` Kieran Bingham [this message]
2016-11-07 12:47 ` [PATCHv7 02/11] i2c: Add the ability to match device to compatible string without an of_node Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 03/11] i2c: Match using traditional OF methods, then by vendor-less compatible strings Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 04/11] i2c: Make I2C ID tables non-mandatory for DT'ed devices Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 05/11] i2c: Export i2c_match_id() for direct use by device drivers Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 06/11] i2c: Provide a temporary .probe_new() call-back type Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 07/11] i2c: match dt-style device names from sysfs interface Kieran Bingham
2016-11-07 19:10 ` Javier Martinez Canillas
2016-11-14 22:27 ` Wolfram Sang
2016-11-15 9:48 ` Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 08/11] i2c: match vendorless strings on the internal string length Kieran Bingham
2016-11-07 19:12 ` Javier Martinez Canillas
2016-11-14 22:27 ` Wolfram Sang
2016-11-15 9:49 ` Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 09/11] mfd: 88pm860x: Move over to new I2C device .probe() call Kieran Bingham
2016-11-07 19:13 ` Javier Martinez Canillas
2016-11-07 12:47 ` [PATCHv7 10/11] mfd: as3722: Rid driver of superfluous I2C device ID structure Kieran Bingham
2016-11-07 19:20 ` Javier Martinez Canillas
2016-11-07 22:05 ` Kieran Bingham
2016-11-08 2:02 ` Javier Martinez Canillas
2016-11-07 23:09 ` Wolfram Sang
2016-11-08 2:14 ` Javier Martinez Canillas
2016-11-07 12:47 ` [PATCHv7 11/11] [TESTPATCH] rtc: convert ds1307 to interim probe_new Kieran Bingham
2016-11-13 18:26 ` [PATCHv7 00/11] i2c: Relax mandatory I2C ID table passing Wolfram Sang
2016-11-17 21:15 ` Wolfram Sang
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=1478522866-29620-2-git-send-email-kieran@bingham.xyz \
--to=kieran@ksquared.org.uk \
--cc=javier@osg.samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=wsa@the-dreams.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;
as well as URLs for NNTP newsgroup(s).