Module Name: src
Committed By: kamil
Date: Sat Feb 22 00:18:55 UTC 2020
Modified Files:
src/tests/modules: t_builtin.c
Log Message:
Avoid undefined behavior in disabledstat
t_builtin.c:174:16, member access within misaligned address 0x741271c25004
for type 'struct modstat_t'
t_builtin.c:175:4, member access within misaligned address 0x741271c251c4
for type 'struct modstat_t'
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/modules/t_builtin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_builtin.c
diff -u src/tests/modules/t_builtin.c:1.4 src/tests/modules/t_builtin.c:1.5
--- src/tests/modules/t_builtin.c:1.4 Sun Jan 27 02:08:50 2019
+++ src/tests/modules/t_builtin.c Sat Feb 22 00:18:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_builtin.c,v 1.4 2019/01/27 02:08:50 pgoyette Exp $ */
+/* $NetBSD: t_builtin.c,v 1.5 2020/02/22 00:18:55 kamil Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. All rights reserved.
@@ -140,6 +140,7 @@ ATF_TC_HEAD(disabledstat, tc)
ATF_TC_BODY(disabledstat, tc)
{
modstat_t *ms;
+ modstat_t m;
struct iovec iov;
size_t len;
int count;
@@ -171,8 +172,9 @@ ATF_TC_BODY(disabledstat, tc)
count = *(int *)iov.iov_base;
ms = (modstat_t *)((char *)iov.iov_base + sizeof(int));
while ( count ) {
- if (strcmp(ms->ms_name, kernfs) == 0) {
- ATF_REQUIRE_EQ(ms->ms_refcnt, (u_int)-1);
+ memcpy(&m, ms, sizeof(m));
+ if (strcmp(m.ms_name, kernfs) == 0) {
+ ATF_REQUIRE_EQ(m.ms_refcnt, (u_int)-1);
found = true;
break;
}
