]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
regmap: Fix reversed bounds check in regmap_raw_write()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 8 Feb 2018 07:23:44 +0000 (10:23 +0300)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 6 Jun 2018 15:48:15 +0000 (11:48 -0400)
BugLink: http://bugs.launchpad.net/bugs/1773233
commit f00e71091ab92eba52122332586c6ecaa9cd1a56 upstream.

We're supposed to be checking that "val_len" is not too large but
instead we check if it is smaller than the max.

The only function affected would be regmap_i2c_smbus_i2c_write() in
drivers/base/regmap/regmap-i2c.c.  Strangely that function has its own
limit check which returns an error if (count >= I2C_SMBUS_BLOCK_MAX) so
it doesn't look like it has ever been able to do anything except return
an error.

Fixes: c335931ed9d2 ("regmap: Add raw_write/read checks for max_raw_write/read sizes")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/base/regmap/regmap.c

index 8d516a9bfc01722567588523b92e7fdcc2b75339..dc7a10e9506ffdc31786b29e04ef59e07a1c8d97 100644 (file)
@@ -1818,7 +1818,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
                return -EINVAL;
        if (val_len % map->format.val_bytes)
                return -EINVAL;
-       if (map->max_raw_write && map->max_raw_write > val_len)
+       if (map->max_raw_write && map->max_raw_write < val_len)
                return -E2BIG;
 
        map->lock(map->lock_arg);