Merge "i2c-msm-v2: Handle Null pointer de-reference" (1a141369) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/i2c/busses/i2c-msm-v2.c

+7 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2314,6 +2314,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);