From fded22fc7e0d67aa0cfacf8d10dd8d21ba74eae1 Mon Sep 17 00:00:00 2001 From: cao-bing-6 Date: Fri, 22 Jul 2022 07:27:03 +0000 Subject: [PATCH] =?UTF-8?q?u-boot=E8=A1=A5=E4=B8=81fix-cve-2022-34835?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cao-bing-6 --- u-boot-2020.01/cmd/i2c.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/u-boot-2020.01/cmd/i2c.c b/u-boot-2020.01/cmd/i2c.c index 4836c96951..e1f48d930e 100644 --- a/u-boot-2020.01/cmd/i2c.c +++ b/u-boot-2020.01/cmd/i2c.c @@ -246,10 +246,10 @@ int i2c_set_bus_speed(unsigned int speed) * * Returns the address length. */ -static uint get_alen(char *arg, int default_len) +static uint get_alen(char *arg, uint default_len) { - int j; - int alen; + uint j; + uint alen; alen = default_len; for (j = 0; j < 8; j++) { @@ -292,7 +292,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv { uint chip; uint devaddr, length; - int alen; + uint alen; u_char *memaddr; int ret; #ifdef CONFIG_DM_I2C @@ -345,7 +345,7 @@ static int do_i2c_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ { uint chip; uint devaddr, length; - int alen; + uint alen; u_char *memaddr; int ret; #ifdef CONFIG_DM_I2C @@ -511,8 +511,8 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] { uint chip; uint addr, length; - int alen; - int j, nbytes, linebytes; + uint alen; + uint j, nbytes, linebytes; int ret; #ifdef CONFIG_DM_I2C struct udevice *dev; @@ -630,9 +630,9 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] { uint chip; ulong addr; - int alen; + uint alen; uchar byte; - int count; + uint count; int ret; #ifdef CONFIG_DM_I2C struct udevice *dev; @@ -716,8 +716,8 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] { uint chip; ulong addr; - int alen; - int count; + uint alen; + uint count; uchar byte; ulong crc; ulong err; @@ -1023,7 +1023,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { uint chip; - int alen; + uint alen; uint addr; uint length; u_char bytes[16]; -- Gitee