From owner-freebsd-hackers@FreeBSD.ORG Wed Mar 12 00:20:11 2014 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7FF241C for ; Wed, 12 Mar 2014 00:20:11 +0000 (UTC) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ADAF687C for ; Wed, 12 Mar 2014 00:20:11 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id ld10so282224pab.40 for ; Tue, 11 Mar 2014 17:20:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=49oom4rQPosA59Lr1DSvbu/B1wZMny9/Kanhhf/Dm+s=; b=APgsAPbt6AvSJXvUV0n4thnZb8jWzm2i6iO/i/CCrdZ6H/54l6CAO8Sfl/sATEJUgK IRu9XpP3+wPaJMzZDgZMrAiGivm3qQ7qidBTGIF5J30rNkvo6FjsyAZHWyMTqgRBxY5X cbbZwB9q9FwQ4mEQNyLBY2yKwSWJKEbk4w0JcgETXUce7uraoGqQIWMerORNlckSl13o 6EtIahFlXRYFQqVhCsIXSlPZt3WG1HBEzhONiYLbe49qjYBdGzLlVS4CtHODmzHdT2xZ 6DUCMyTSdRTI22lgLskp3sks+yd6aFPCOy2KZonAhXxjxpKQYRXKe6cJpfm7tPEioKpY Vdbw== X-Gm-Message-State: ALoCoQnwaaC7zhwhduyVusoFh7jRQ4q4693BwlrPa2a5xKjQdzcBR9MncBRji9Z5ymQtL0g2IxdO X-Received: by 10.68.197.99 with SMTP id it3mr1173801pbc.37.1394583611165; Tue, 11 Mar 2014 17:20:11 -0700 (PDT) Received: from cmeyer.west.isilon.com (c-67-182-131-225.hsd1.wa.comcast.net. [67.182.131.225]) by mx.google.com with ESMTPSA id jd5sm1276051pbb.18.2014.03.11.17.20.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2014 17:20:10 -0700 (PDT) From: Conrad Meyer To: freebsd-hackers@freebsd.org Subject: [PATCH 5/5] kern/kern_linker.c: Use correct type for sizeof() in malloc() Date: Tue, 11 Mar 2014 17:19:43 -0700 Message-Id: <1394583583-19023-6-git-send-email-conrad.meyer@isilon.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394583583-19023-1-git-send-email-conrad.meyer@isilon.com> References: <1394583583-19023-1-git-send-email-conrad.meyer@isilon.com> X-Mailman-Approved-At: Wed, 12 Mar 2014 02:10:30 +0000 Cc: Conrad Meyer , Jeffrey Roberson X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 00:20:11 -0000 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 --- 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