# git rev-parse -q --verify ec7f49619d8ee13e108740c82f942cd401b989e9^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify ec7f49619d8ee13e108740c82f942cd401b989e9^{commit} ec7f49619d8ee13e108740c82f942cd401b989e9 # git checkout -q -f -B kisskb ec7f49619d8ee13e108740c82f942cd401b989e9 # git clean -qxdf # < git log -1 # commit ec7f49619d8ee13e108740c82f942cd401b989e9 # Merge: d928e8f3af38 eb7bac3973d2 # Author: Linus Torvalds # Date: Fri May 13 16:20:25 2022 -0700 # # Merge tag 'drm-fixes-2022-05-14' of git://anongit.freedesktop.org/drm/drm # # Pull more drm fixes from Dave Airlie: # "Turns out I was right, some fixes hadn't made it to me yet. The vmwgfx # ones also popped up later, but all seem like bad enough things to fix. # The dma-buf, vc4 and nouveau ones are all pretty small. # # The fbdev fixes are a bit more complicated: a fix to cleanup fbdev # devices properly, uncovered some use-after-free bugs in existing # drivers. Then the fix for those bugs wasn't correct. This reverts that # fix, and puts the proper fixes in place in the drivers to avoid the # use-after-frees. # # This has had a fair number of eyes on it at this stage, and I'm # confident enough that it puts things in the right place, and is less # dangerous than reverting our way out of the initial change at this # stage. # # fbdev: # - revert NULL deref fix that turned into a use-after-free # - prevent use-after-free in fbdev # - efifb/simplefb/vesafb: fix cleanup paths to avoid use-after-frees # # dma-buf: # - fix panic in stats setup # # vc4: # - fix hdmi build # # nouveau: # - tegra iommu present fix # - fix leak in backlight name # # vmwgfx: # - Black screen due to fences using FIFO checks on SVGA3 # - Random black screens on boot due to uninitialized drm_mode_fb_cmd2 # - Hangs on SVGA3 due to command buffers being used with gbobjects" # # * tag 'drm-fixes-2022-05-14' of git://anongit.freedesktop.org/drm/drm: # drm/vmwgfx: Disable command buffers on svga3 without gbobjects # drm/vmwgfx: Initialize drm_mode_fb_cmd2 # drm/vmwgfx: Fix fencing on SVGAv3 # drm/vc4: hdmi: Fix build error for implicit function declaration # dma-buf: call dma_buf_stats_setup after dmabuf is in valid list # fbdev: efifb: Fix a use-after-free due early fb_info cleanup # drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name() # drm/nouveau/tegra: Stop using iommu_present() # fbdev: vesafb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: efifb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: simplefb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: Prevent possible use-after-free in fb_release() # Revert "fbdev: Make fb_release() return -ENODEV if fbdev was unregistered" # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 ec7f49619d8ee13e108740c82f942cd401b989e9 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:529, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:446:26: note: in expansion of macro 'printk_index_wrap' 446 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:02:34.271067