Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/sdmmc Use unsigned to avoid undefined behavior in sd...



details:   https://anonhg.NetBSD.org/src/rev/e67ae3f01d88
branches:  trunk
changeset: 1022716:e67ae3f01d88
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Aug 03 07:54:39 2021 +0000

description:
Use unsigned to avoid undefined behavior in sdmmc_mem_sd_switch().
Found by kUBSan.

diffstat:

 sys/dev/sdmmc/sdmmc_mem.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r d29aba476c1c -r e67ae3f01d88 sys/dev/sdmmc/sdmmc_mem.c
--- a/sys/dev/sdmmc/sdmmc_mem.c Tue Aug 03 07:12:50 2021 +0000
+++ b/sys/dev/sdmmc/sdmmc_mem.c Tue Aug 03 07:54:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdmmc_mem.c,v 1.73 2021/06/13 09:50:02 mlelstv Exp $   */
+/*     $NetBSD: sdmmc_mem.c,v 1.74 2021/08/03 07:54:39 msaitoh Exp $   */
 /*     $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $      */
 
 /*
@@ -45,7 +45,7 @@
 /* Routines for SD/MMC memory cards. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.73 2021/06/13 09:50:02 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.74 2021/08/03 07:54:39 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1604,8 +1604,8 @@
        cmd.c_datalen = statlen;
        cmd.c_blklen = statlen;
        cmd.c_opcode = SD_SEND_SWITCH_FUNC;
-       cmd.c_arg =
-           (!!mode << 31) | (function << gsft) | (0x00ffffff & ~(0xf << gsft));
+       cmd.c_arg = ((uint32_t)!!mode << 31) |
+           (function << gsft) | (0x00ffffff & ~(0xf << gsft));
        cmd.c_flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1 | SCF_RSP_SPI_R1;
        if (ISSET(sc->sc_caps, SMC_CAPS_DMA))
                cmd.c_dmamap = sc->sc_dmap;



Home | Main Index | Thread Index | Old Index