Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Mar 2014 17:19:43 -0700
From:      Conrad Meyer <cemeyer@uw.edu>
To:        freebsd-hackers@freebsd.org
Cc:        Conrad Meyer <conrad.meyer@isilon.com>, Jeffrey Roberson <jeff@freebsd.org>
Subject:   [PATCH 5/5] kern/kern_linker.c: Use correct type for sizeof() in malloc()
Message-ID:  <1394583583-19023-6-git-send-email-conrad.meyer@isilon.com>
In-Reply-To: <1394583583-19023-1-git-send-email-conrad.meyer@isilon.com>
References:  <1394583583-19023-1-git-send-email-conrad.meyer@isilon.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Another one reported by Clang static analysis. Again, both are pointer
types, so it's not a huge deal. Just fix it for correctness.

Signed-off-by: Conrad Meyer <conrad.meyer@isilon.com>
---
 sys/kern/kern_linker.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index fa09b3f..7d2aa50 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -725,14 +725,13 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep)
 	linker_file_t *newdeps;
 
 	sx_assert(&kld_sx, SA_XLOCKED);
-	newdeps = malloc((file->ndeps + 1) * sizeof(linker_file_t *),
-	    M_LINKER, M_WAITOK | M_ZERO);
+	newdeps = malloc((file->ndeps + 1) * sizeof(*newdeps), M_LINKER,
+	    M_WAITOK | M_ZERO);
 	if (newdeps == NULL)
 		return (ENOMEM);
 
 	if (file->deps) {
-		bcopy(file->deps, newdeps,
-		    file->ndeps * sizeof(linker_file_t *));
+		bcopy(file->deps, newdeps, file->ndeps * sizeof(*newdeps));
 		free(file->deps, M_LINKER);
 	}
 	file->deps = newdeps;
-- 
1.8.5.3




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1394583583-19023-6-git-send-email-conrad.meyer>