diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-11 07:01:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-11 07:01:18 -0700 |
| commit | 25ad3d9b1584d692f7c49e677bdd23c5c93c89eb (patch) | |
| tree | bda50258789624e852f2e4100a4647d56b8a73d9 | |
| parent | 2592658a93710a5c65353d3e4e3d08bc986e83b3 (diff) | |
| parent | 5d1bbf389c51de5bc3e7754a63da24f965b841ff (diff) | |
Merge "i2c-msm-v2: Handle Null pointer de-reference"
| -rw-r--r-- | drivers/i2c/busses/i2c-msm-v2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-msm-v2.c b/drivers/i2c/busses/i2c-msm-v2.c index d72953f2df23..198e55829226 100644 --- a/drivers/i2c/busses/i2c-msm-v2.c +++ b/drivers/i2c/busses/i2c-msm-v2.c @@ -2330,6 +2330,12 @@ i2c_msm_frmwrk_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) struct i2c_msm_ctrl *ctrl = i2c_get_adapdata(adap); struct i2c_msm_xfer *xfer = &ctrl->xfer; + if (num < 1) { + dev_err(ctrl->dev, + "error on number of msgs(%d) received\n", num); + return -EINVAL; + } + if (IS_ERR_OR_NULL(msgs)) { dev_err(ctrl->dev, " error on msgs Accessing invalid pointer location\n"); return PTR_ERR(msgs); |