From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 13B72EEAB for ; Mon, 15 Dec 2025 01:18:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765761525; cv=none; b=EB/vqnIr2gZ0gshDxYstVUkL1vcX3yearVCk6grU/yCwWOqodtIh61Km2nIGuGwne/HQoC6q5FHyEHDD223IqNR8pLZprBJXh4/w3wxy8xXcZzittDDAVuCHyzEMZsilHkj58rlBfpVEeZtsHzkyw1CEZt+dcI+9kbNedIDOV4w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765761525; c=relaxed/simple; bh=XPidddj58XkMI9MuSD/vpzLDvAp+UEzHdbtJAMkcIPw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OrnHJJOwr7MAZLpHs4NLnUoUiZA9qQ8k0pYNKub6LZ6u1WMb13YlZBT7l6Xuu37U3ImEAJHsPoN3tqneH6XjmFeFF6lHz2wtvtzQ9hINYhYyU011eYek52+IgdFMYzynyz2z2TVp17imJp6X4ARmeSkqyTivoblgtUkq7vjAkTo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=J1wyg6XV; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="J1wyg6XV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765761522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lEhx54QjWtv58WgbpuaBuTx0YRc6rn3nDVdHrytc9s8=; b=J1wyg6XVXX7i7+M2QUBBjKXbKGpl/lbKnGsQkFA1COiv5bs4p5nTk7q2V3WEGaZI7G0Mx4 Bo/j5WtgaKwu6W+i0L2ZwzMjsclhoeQLh+zmjPbJq5mi2rvvfVGET0Vqywu+UBEj9geTi4 klGXb55DBT0U7uQmk8UF8fkCrBq3/to= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-668-90lOy28QMGugOTAm-pb25Q-1; Sun, 14 Dec 2025 20:18:38 -0500 X-MC-Unique: 90lOy28QMGugOTAm-pb25Q-1 X-Mimecast-MFC-AGG-ID: 90lOy28QMGugOTAm-pb25Q_1765761517 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EAF5D1956050; Mon, 15 Dec 2025 01:18:36 +0000 (UTC) Received: from localhost (unknown [10.72.112.95]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A4A61800367; Mon, 15 Dec 2025 01:18:34 +0000 (UTC) Date: Mon, 15 Dec 2025 09:18:31 +0800 From: Baoquan He To: Qiang Ma Cc: akpm@linux-foundation.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] kexec: Fix uninitialized struct kimage *image pointer Message-ID: References: <20251212071656.834079-1-maqianga@uniontech.com> <84FB6FCADDAE5EBE+e11782ba-7483-40f4-8a40-a5e26f51183d@uniontech.com> 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 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <84FB6FCADDAE5EBE+e11782ba-7483-40f4-8a40-a5e26f51183d@uniontech.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 On 12/14/25 at 07:35pm, Qiang Ma wrote: > > 在 2025/12/12 18:53, Baoquan He 写道: > > On 12/12/25 at 03:16pm, Qiang Ma wrote: > > > The image is initialized to NULL. Then, after calling kimage_alloc_init, > > > we can directly goto 'out' because at this time, the kimage_free will > > > determine whether image is a NULL pointer. > > Rechecked the code flow, in kimage_alloc_init(), if anything wrong, the > > allocated memory are all freed via out_free_control_pages and > > out_free_image accordingly, any place missed? If no, I think the current > > code is correctly handled. > I rechecked the code and found no omissions. Hmm, my bad, I didn't say my question clearly. I checked code, didn't find anything wrong in the current code. In kimage_alloc_init(), the allocated memory are all freed on failure, no memory leaked. Means you are fixing correct code. > > > Signed-off-by: Qiang Ma > > > --- > > > kernel/kexec.c | 4 +++- > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > Acked-by: Baoquan He > > > > > diff --git a/kernel/kexec.c b/kernel/kexec.c > > > index 28008e3d462e..9bb1f2b6b268 100644 > > > --- a/kernel/kexec.c > > > +++ b/kernel/kexec.c > > > @@ -95,6 +95,8 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, > > > unsigned long i; > > > int ret; > > > + image = NULL; > > > + > > > /* > > > * Because we write directly to the reserved memory region when loading > > > * crash kernels we need a serialization here to prevent multiple crash > > > @@ -129,7 +131,7 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, > > > ret = kimage_alloc_init(&image, entry, nr_segments, segments, flags); > > > if (ret) > > > - goto out_unlock; > > > + goto out; > > > if (flags & KEXEC_PRESERVE_CONTEXT) > > > image->preserve_context = 1; > > > -- > > > 2.20.1 > > > > > >