tools lib traceevent: fix pointer-integer size mismatch

mrutland-arm · acmel · commit 0e9e79a13ab9 · 2014-01-15T17:04:38.000-03:00
The scsi and cfg80211 plugins cast between unsigned long long and pointers, which is problematic for architectures where unsigned long long is wider than the native pointer size: linux/tools/lib/traceevent/plugin_scsi.c: In function ‘process_scsi_trace_parse_cdb’: linux/tools/lib/traceevent/plugin_scsi.c:408:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] scsi_trace_parse_cdb(s, (unsigned char *) args[1], args[2]); linux/tools/lib/traceevent/plugin_cfg80211.c: In function ‘process___le16_to_cpup’: linux/tools/lib/traceevent/plugin_cfg80211.c:11:18: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] uint16_t *val = (uint16_t *) args[0]; This patch adds an intermediate cast to unsigned long, silencing the warning. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/1389782648-4417-3-git-send-email-mark.rutland@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/lib/traceevent/plugin_cfg80211.c b/tools/lib/traceevent/plugin_cfg80211.c
@@ -8,7 +8,7 @@ static unsigned long long
 process___le16_to_cpup(struct trace_seq *s,
 		       unsigned long long *args)
 {
-	uint16_t *val = (uint16_t *) args[0];
+	uint16_t *val = (uint16_t *) (unsigned long) args[0];
 	return val ? (long long) le16toh(*val) : 0;
 }
 
diff --git a/tools/lib/traceevent/plugin_scsi.c b/tools/lib/traceevent/plugin_scsi.c
@@ -405,7 +405,7 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,
 						unsigned long long *args)
 {
-	scsi_trace_parse_cdb(s, (unsigned char *) args[1], args[2]);
+	scsi_trace_parse_cdb(s, (unsigned char *) (unsigned long) args[1], args[2]);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ static unsigned long long`
`8`	`8`	`process___le16_to_cpup(struct trace_seq *s,`
`9`	`9`	`unsigned long long *args)`
`10`	`10`	`{`
`11`		`- uint16_t val = (uint16_t ) args[0];`
	`11`	`+ uint16_t val = (uint16_t ) (unsigned long) args[0];`
`12`	`12`	`return val ? (long long) le16toh(*val) : 0;`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ scsi_trace_parse_cdb(struct trace_seq p, unsigned char cdb, int len)`
`405`	`405`	`unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,`
`406`	`406`	`unsigned long long *args)`
`407`	`407`	`{`
`408`		`- scsi_trace_parse_cdb(s, (unsigned char *) args[1], args[2]);`
	`408`	`+ scsi_trace_parse_cdb(s, (unsigned char *) (unsigned long) args[1], args[2]);`
`409`	`409`	`return 0;`
`410`	`410`	`}`
`411`	`411`