Blame SOURCES/strace-strict-aliasing.patch

1ca6dd
diff -Nrup a/system.c b/system.c
1ca6dd
--- a/system.c	2012-03-16 05:02:22.000000000 -0600
1ca6dd
+++ b/system.c	2013-02-18 15:17:23.651569983 -0700
1ca6dd
@@ -516,10 +516,14 @@ print_cap_header(struct tcb *tcp, unsign
1ca6dd
 		 umoven(tcp, addr, sizeof(*arg.p), arg.c) < 0)
1ca6dd
 		tprintf("%#lx", addr);
1ca6dd
 	else {
1ca6dd
+		__u32 version;
1ca6dd
+		int pid;
1ca6dd
 		tprints("{");
1ca6dd
-		printxval(cap_version, arg.p->version,
1ca6dd
+		memcpy (&version, &arg.p->version, sizeof (__u32));
1ca6dd
+		printxval(cap_version, version,
1ca6dd
 			  "_LINUX_CAPABILITY_VERSION_???");
1ca6dd
-		tprintf(", %d}", arg.p->pid);
1ca6dd
+		memcpy (&pid, &arg.p->pid, sizeof (int));
1ca6dd
+		tprintf(", %d}", pid);
1ca6dd
 	}
1ca6dd
 }
1ca6dd
 
1ca6dd
@@ -537,12 +541,16 @@ print_cap_data(struct tcb *tcp, unsigned
1ca6dd
 		 umoven(tcp, addr, sizeof(*arg.p), arg.c) < 0)
1ca6dd
 		tprintf("%#lx", addr);
1ca6dd
 	else {
1ca6dd
+		__u32 x;
1ca6dd
 		tprints("{");
1ca6dd
-		printflags(capabilities, arg.p->effective, "CAP_???");
1ca6dd
+		memcpy (&x, &arg.p->effective, sizeof (__u32));
1ca6dd
+		printflags(capabilities, x, "CAP_???");
1ca6dd
 		tprints(", ");
1ca6dd
-		printflags(capabilities, arg.p->permitted, "CAP_???");
1ca6dd
+		memcpy (&x, &arg.p->permitted, sizeof (__u32));
1ca6dd
+		printflags(capabilities, x, "CAP_???");
1ca6dd
 		tprints(", ");
1ca6dd
-		printflags(capabilities, arg.p->inheritable, "CAP_???");
1ca6dd
+		memcpy (&x, &arg.p->inheritable, sizeof (__u32));
1ca6dd
+		printflags(capabilities, x, "CAP_???");
1ca6dd
 		tprints("}");
1ca6dd
 	}
1ca6dd
 }