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 293542FFDD6; Sat, 4 Jul 2026 09:19:03 +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=1783156745; cv=none; b=Hbni2+0eWDIUkSEtVUxQLUwcCQl4ORUggpyn9eAk9bmexh+255x4oe/6k78f81qGvkZvwN+MJw40dyUf/7NfD8ui75TUxFH8wuU1maMluo0aGh9I44QKASkBfVlzLi+kG35rTGqhG4iNmH/uyqGd3gnwMYomK0jeKViEG0Df884= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783156745; c=relaxed/simple; bh=i1lbix2yxFaKw1sSmCBK6shqFbbHK62eEr9rY8Ys05k=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kqHXLkD8buwaHAVzjswVuIOZQK0Fs726zsWK3Y9jfTatbl3FM/qPOziUMlQamb00dkkQP3u/bBa4UtW/yQ6rPIhaR5LTE1r4TzA3Kpw8VpaK5nIxCaYxPc+eGHh89WBX16zeWxYo3ZscLq6W5/M/GOJP/PRa8Mtt4vgaPU9blfc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=emSEtrMi; 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="emSEtrMi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EC561F000E9; Sat, 4 Jul 2026 09:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783156743; bh=Ja37CdVukon/JrHeLqv4AFUthgRyrTWJsuQQIVUGu2U=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=emSEtrMiBTi2wSuClr1Lz9beyMkKYO6J5+NafqFwKl9Q+WMY6EPnnVjLNu1y1gFv4 evuoJyr3NXqR+KPt2PKo7qTh0VQlJ09zKDj6VGTbHv33kT3wv9PKhJ9SdXPchYej7A 912ahLVIKjSIf2tC90JFEncyRwAok641Rj9k8+gb/VeFlAfSx4fjhzX59ZiwUHsg1+ 7idNuueBF8/w7975rUhJWwE5DtCFOM4T1xREtGN7/z1MgxqQBOlSUVI9XynXpXz4FM 98qgYUSVqq5UpvNXhtk8ks7CHAZPJQI27ck/x1Ps3y0rfGfepOJrzXCIN/ziotwDS2 JnswzJv9sIaGg== Message-ID: Date: Sat, 4 Jul 2026 11:19:00 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] soc: fsl: dpio: Use common error handling code in two functions To: Markus Elfring , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Roy Pledge Cc: LKML , kernel-janitors@vger.kernel.org References: <690827f2-e746-4378-bb7c-9948cd69dc15@web.de> Content-Language: fr-FR From: "Christophe Leroy (CS GROUP)" In-Reply-To: <690827f2-e746-4378-bb7c-9948cd69dc15@web.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Le 11/06/2026 à 12:02, Markus Elfring a écrit : > From: Markus Elfring > Date: Thu, 11 Jun 2026 11:56:18 +0200 > > Use additional labels so that a bit of exception handling can be better > reused at the end of two function implementations. > > This issue was detected by using the Coccinelle software. I think it would be better to declare obj and ret as automatic free instead: struct dpaa2_io __free(kfree) *obj = kmalloc_obj(*obj); > > Signed-off-by: Markus Elfring > --- > drivers/soc/fsl/dpio/dpio-service.c | 30 ++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c > index 317ca50b0c2b..025d9fb5660d 100644 > --- a/drivers/soc/fsl/dpio/dpio-service.c > +++ b/drivers/soc/fsl/dpio/dpio-service.c > @@ -140,10 +140,8 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc, > return NULL; > > /* check if CPU is out of range (-1 means any cpu) */ > - if (desc->cpu != DPAA2_IO_ANY_CPU && desc->cpu >= num_possible_cpus()) { > - kfree(obj); > - return NULL; > - } > + if (desc->cpu != DPAA2_IO_ANY_CPU && desc->cpu >= num_possible_cpus()) > + goto free_obj; > > obj->dpio_desc = *desc; > obj->swp_desc.cena_bar = obj->dpio_desc.regs_cena; > @@ -158,11 +156,8 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc, > qman_256_cycles_per_ns = 256000 / (obj->swp_desc.qman_clk / 1000000); > obj->swp_desc.qman_256_cycles_per_ns = qman_256_cycles_per_ns; > obj->swp = qbman_swp_init(&obj->swp_desc); > - > - if (!obj->swp) { > - kfree(obj); > - return NULL; > - } > + if (!obj->swp) > + goto free_obj; > > INIT_LIST_HEAD(&obj->node); > spin_lock_init(&obj->lock_mgmt_cmd); > @@ -192,6 +187,10 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc, > obj->frames = 0; > > return obj; > + > +free_obj: > + kfree(obj); > + return NULL; > } > > /** > @@ -665,10 +664,8 @@ struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames, > ret->max = max_frames; > size = max_frames * sizeof(struct dpaa2_dq) + 64; > ret->alloced_addr = kzalloc(size, GFP_KERNEL); > - if (!ret->alloced_addr) { > - kfree(ret); > - return NULL; > - } > + if (!ret->alloced_addr) > + goto free_ret; > > ret->vaddr = PTR_ALIGN(ret->alloced_addr, 64); > ret->paddr = dma_map_single(dev, ret->vaddr, > @@ -676,14 +673,17 @@ struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames, > DMA_FROM_DEVICE); > if (dma_mapping_error(dev, ret->paddr)) { > kfree(ret->alloced_addr); > - kfree(ret); > - return NULL; > + goto free_ret; > } > > ret->idx = 0; > ret->dev = dev; > > return ret; > + > +free_ret: > + kfree(ret); > + return NULL; > } > EXPORT_SYMBOL_GPL(dpaa2_io_store_create); >