From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 223E744DB73 for ; Fri, 22 May 2026 14:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460505; cv=none; b=DxZ43XNeN1htHaYwx8BkIKmG3rwTICJZ+8Ft/IP/xItVFahb9whruEuJXR/nAuYc6FS1HX1cJMd5uhDth2hKXXFtdTYsAii0H9nzVjgShSYMz9avpJe20p09oFxqqFxXyaL3VaNpgAuAWLb34rcZlUXMcFZmCq4C7KtpxgR9LSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460505; c=relaxed/simple; bh=jY+x/NHFlh23eJCFlQoaY3OuKIiwHKJ3cNAQRdrOTbc=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=WEZDMXfog/BBTSwHsleeJhQRNaHzC6l5zIddRTwYCurNgEsiHHF1fQuP/Qss0k/1pYB4ppcMgC5PkZeUz4SXHpnal4CejIXAskdQOP2cnigG+i+UGQiW4VP9rjHhYuvsOH23terd8e1nO6ps9HZ4GvUKbykkFLTozfcQ9G7BUT4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BAFFlSlB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BAFFlSlB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C7CB1F01561; Fri, 22 May 2026 14:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779460503; bh=3dNjfvyvVVsoRoVMfzr/Nde5yF6F/Nc35akU3BHHVkQ=; h=Date:From:To:Cc:Subject:References; b=BAFFlSlBga9Wzm54uf/NDloULB/dFbsFfDj981FS7t3veg1b8s78FaOw+O6dRhuQE YtrUOGZBzfHilQ5RHAMSwphNP6WpOqvu0Px5UHr00aT6gU5uARtOdHwTtCC0LK1iY0 4C8h5lvELmiWg0n+eIlGz+R+ge3MiStdc6aZWQ2iu1VxWUrsSiHPY+LfI2rpLkhGzZ sgFyYfSv1GfBkAaKwd8fxCURSAVp+J9UYj4dvnw8ShG/gWwWJ5FuvIuULvZnIJMr0w eZN9t1XDZhRKjbbGpIvmcRd7nHqqn9t3I8jCbVmdOKSjsvCm9VY3WC4uDVohz8mOdP FYkXIXtI6WfbA== Received: from rostedt by gandalf with local (Exim 4.99.2) (envelope-from ) id 1wQQyE-000000066Bc-43p4; Fri, 22 May 2026 10:35:26 -0400 Message-ID: <20260522143526.835124644@kernel.org> User-Agent: quilt/0.69 Date: Fri, 22 May 2026 10:35:20 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Yu Peng Subject: [for-next][PATCH 12/15] tracing: Use krealloc_array() for trace option array growth References: <20260522143508.298439732@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Yu Peng Use krealloc_array() when growing tr->topts instead of open-coding the size calculation in krealloc(). This makes the resize path use the helper intended for array allocations and avoids manual multiplication of the element count and element size. Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Link: https://patch.msgid.link/20260519083409.3885032-1-pengyu@kylinos.cn Signed-off-by: Yu Peng Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6eb4d3097a4d..aec3f31ed027 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7928,8 +7928,8 @@ create_trace_option_files(struct trace_array *tr, struct tracer *tracer, if (!topts) return 0; - tr_topts = krealloc(tr->topts, sizeof(*tr->topts) * (tr->nr_topts + 1), - GFP_KERNEL); + tr_topts = krealloc_array(tr->topts, tr->nr_topts + 1, sizeof(*tr->topts), + GFP_KERNEL); if (!tr_topts) { kfree(topts); return -ENOMEM; -- 2.53.0