Fix interpretation of unknown ioctcmds

RH-steve-grubb · RH-steve-grubb · commit 71aaf242f921 · 2018-02-02T06:36:08.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@
 - Make a reload legacy service for auditd
 - In auparse python bindings, expose some new types that were missing
 - In normalizer, pickup subject kind for user_login events
+- Fix interpretation of unknown ioctcmds (#1540507)
 
 2.8.2
 - Update tables for 4.14 kernel
diff --git a/auparse/interpret.c b/auparse/interpret.c
@@ -2112,7 +2112,7 @@ static const char *print_ioctl_req(const char *val)
 	r = ioctlreq_i2s(req);
 	if (r != NULL)
 		return strdup(r);
-	if (asprintf(&out, "0x%s", val) < 0)
+	if (asprintf(&out, "0x%x", req) < 0)
 		out = NULL;
 	return out;
 }

Original file line number	Diff line number	Diff line change
`@@ -2112,7 +2112,7 @@ static const char print_ioctl_req(const char val)`
`2112`	`2112`	`r = ioctlreq_i2s(req);`
`2113`	`2113`	`if (r != NULL)`
`2114`	`2114`	`return strdup(r);`
`2115`		`- if (asprintf(&out, "0x%s", val) < 0)`
	`2115`	`+ if (asprintf(&out, "0x%x", req) < 0)`
`2116`	`2116`	`out = NULL;`
`2117`	`2117`	`return out;`
`2118`	`2118`	`}`