浏览代码

coresight: etm4x: Fix bit shifting

ctxid_pid and vmid_val in config are of type u64. When an integer
0xFF is being left shifted more than 32 bits, the behavior is
undefined. The fix is to specify 0xFF as an unsigned long.

Detected by Coverity scan: CID 37650, 37651 (Bad bit shift operation)

Signed-off-by: Bo Yan <byan@nvidia.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bo Yan 7 年之前
父节点
当前提交
57adbeea64
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/hwtracing/coresight/coresight-etm4x-sysfs.c

+ 2 - 2
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c

@@ -1780,7 +1780,7 @@ static ssize_t ctxid_masks_store(struct device *dev,
 		 */
 		 */
 		for (j = 0; j < 8; j++) {
 		for (j = 0; j < 8; j++) {
 			if (maskbyte & 1)
 			if (maskbyte & 1)
-				config->ctxid_pid[i] &= ~(0xFF << (j * 8));
+				config->ctxid_pid[i] &= ~(0xFFUL << (j * 8));
 			maskbyte >>= 1;
 			maskbyte >>= 1;
 		}
 		}
 		/* Select the next ctxid comparator mask value */
 		/* Select the next ctxid comparator mask value */
@@ -1963,7 +1963,7 @@ static ssize_t vmid_masks_store(struct device *dev,
 		 */
 		 */
 		for (j = 0; j < 8; j++) {
 		for (j = 0; j < 8; j++) {
 			if (maskbyte & 1)
 			if (maskbyte & 1)
-				config->vmid_val[i] &= ~(0xFF << (j * 8));
+				config->vmid_val[i] &= ~(0xFFUL << (j * 8));
 			maskbyte >>= 1;
 			maskbyte >>= 1;
 		}
 		}
 		/* Select the next vmid comparator mask value */
 		/* Select the next vmid comparator mask value */