Module Name: src Committed By: msaitoh Date: Sat Aug 17 15:49:13 UTC 2019
Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen.c Log Message: Set "enabled" value only when hpd.hpd is not RADEON_HPD_NONE(== 0xff) to avoid 1 << 255. Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.2 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.1 Mon Aug 27 14:38:20 2018 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c Sat Aug 17 15:49:13 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_evergreen.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $ */ +/* $NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. @@ -24,7 +24,7 @@ * Authors: Alex Deucher */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $"); #include <linux/bitops.h> #include <linux/firmware.h> @@ -1872,7 +1872,8 @@ void evergreen_hpd_init(struct radeon_de break; } radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); - enabled |= 1 << radeon_connector->hpd.hpd; + if (radeon_connector->hpd.hpd != RADEON_HPD_NONE) + enabled |= 1 << radeon_connector->hpd.hpd; } radeon_irq_kms_enable_hpd(rdev, enabled); }