Messages in this thread | | | Date | Thu, 22 Apr 2021 09:26:25 +0100 | From | Jonathan Cameron <> | Subject | Re: [PATCH 093/190] Revert "iio: hmc5843: fix potential NULL pointer dereferences" |
| |
On Wed, 21 Apr 2021 14:59:28 +0200 Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> This reverts commit 536cc27deade8f1ec3c1beefa60d5fbe0f6fcb28. > > Commits from @umn.edu addresses have been found to be submitted in "bad > faith" to try to test the kernel community's ability to review "known > malicious" changes. The result of these submissions can be found in a > paper published at the 42nd IEEE Symposium on Security and Privacy > entitled, "Open Source Insecurity: Stealthily Introducing > Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University > of Minnesota) and Kangjie Lu (University of Minnesota). > > Because of this, all submissions from this group must be reverted from > the kernel tree and will need to be re-reviewed again to determine if > they actually are a valid fix. Until that work is complete, remove this > change to ensure that no problems are being introduced into the > codebase. > > Cc: Kangjie Lu <kjlu@umn.edu> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Hi Greg,
Checked this one. As far as I can tell it was a valid cleanup of error handling. Far from critical though and unlikely to be seen in practice.
So either leave it in place, or we can bring it back later. I don't mind which.
> --- > drivers/iio/magnetometer/hmc5843_i2c.c | 7 +------ > drivers/iio/magnetometer/hmc5843_spi.c | 7 +------ > 2 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/iio/magnetometer/hmc5843_i2c.c b/drivers/iio/magnetometer/hmc5843_i2c.c > index 67fe657fdb3e..9a4491233d08 100644 > --- a/drivers/iio/magnetometer/hmc5843_i2c.c > +++ b/drivers/iio/magnetometer/hmc5843_i2c.c > @@ -55,13 +55,8 @@ static const struct regmap_config hmc5843_i2c_regmap_config = { > static int hmc5843_i2c_probe(struct i2c_client *cli, > const struct i2c_device_id *id) > { > - struct regmap *regmap = devm_regmap_init_i2c(cli, > - &hmc5843_i2c_regmap_config); > - if (IS_ERR(regmap)) > - return PTR_ERR(regmap); > - > return hmc5843_common_probe(&cli->dev, > - regmap, > + devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config), > id->driver_data, id->name); > } > > diff --git a/drivers/iio/magnetometer/hmc5843_spi.c b/drivers/iio/magnetometer/hmc5843_spi.c > index d827554c346e..58bdbc7257ec 100644 > --- a/drivers/iio/magnetometer/hmc5843_spi.c > +++ b/drivers/iio/magnetometer/hmc5843_spi.c > @@ -55,7 +55,6 @@ static const struct regmap_config hmc5843_spi_regmap_config = { > static int hmc5843_spi_probe(struct spi_device *spi) > { > int ret; > - struct regmap *regmap; > const struct spi_device_id *id = spi_get_device_id(spi); > > spi->mode = SPI_MODE_3; > @@ -65,12 +64,8 @@ static int hmc5843_spi_probe(struct spi_device *spi) > if (ret) > return ret; > > - regmap = devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config); > - if (IS_ERR(regmap)) > - return PTR_ERR(regmap); > - > return hmc5843_common_probe(&spi->dev, > - regmap, > + devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config), > id->driver_data, id->name); > } >
| |