Module Name: src
Committed By: msaitoh
Date: Sat Aug 17 16:02:55 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_r600.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.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.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_r600.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.2 Sat Aug 17 15:50:05 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c Sat Aug 17 16:02:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_r600.c,v 1.2 2019/08/17 15:50:05 msaitoh Exp $ */
+/* $NetBSD: radeon_r600.c,v 1.3 2019/08/17 16:02:55 msaitoh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.2 2019/08/17 15:50:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.3 2019/08/17 16:02:55 msaitoh Exp $");
#include <linux/bitops.h>
#include <linux/slab.h>
@@ -1008,7 +1008,8 @@ void r600_hpd_init(struct radeon_device
break;
}
}
- enable |= 1 << radeon_connector->hpd.hpd;
+ if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
+ enable |= 1 << radeon_connector->hpd.hpd;
radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
}
radeon_irq_kms_enable_hpd(rdev, enable);
