From nobody Thu Sep 24 18:39:53 2026 Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BAC651DDFB for ; Mon, 21 Sep 2026 22:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790029549; cv=none; b=HeVzT2nY7PgDANeFRJucvn3bZ4M5nc+AcBKcdiQvBFb5TH6zeZvMoACpsgvItu52OXi8fXBO3m3ZJ8CE9gJxtvWRNqrw/dEqIX1EXPv45agmzEy8DkzgBLDc19BmDXLuRenKuRqazhCrlbWqwZnm+mpj2+NVEqQa0v5Ny/iReco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790029549; c=relaxed/simple; bh=ppfiKvwRFb3MsV+DdIeNcTDxiyrekIDHGHyJAgdAWnI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aQIaipNF1tTqe/kJbF/UVlc5xkG0YlC4ce/44aRO8ZL7RlIh+1Cbmr7yrY8Pmf+FmXpuzP7i5oBf6fEwY2MqDL3KhFQZNU5RIznKQcoE/uZxKlokJ7mZxq6DIhvQ/3akDK85MvD9XC7L0WLe5ky5HCeFXrMwAL6//Er2TWz8pU0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=F5AptC+F; arc=none smtp.client-ip=74.125.227.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F5AptC+F" Received: by mail-pj2-f13.google.com with SMTP id 98e67ed59e1d1-396ccafb752so2906342a91.0 for ; Mon, 21 Sep 2026 15:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790029548; x=1790634348; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Wtx8XxjWiahHO9saGrrA8bVtKn979Y+PzPTB5vfUlfs=; b=F5AptC+FXwwyvr/Jly9RSBRDEJq0bjfnuweoqoHH6MQjBLZbumla23BMh4QJL6m76f hJ9QjY05ORXh7f/gQxVzKSyAKD8rOSyselm7L5myBgPl1YbR1Zvcf44pfVvQQcHn5s6s v6Rk3j6jP6CoePB21++G4RVH9J2pMQxmsnm30dnE63yQA5FWD/MkR8GkdQFYL6XxTio2 0P6jycYmsmtewuzpfkUcH8/QS/9hyxjQU2gE1CvXWZa/fE6Rbt9ltdBdPf98lzfwVnAT 4LvSnXWeEXmFt4IEOFXQ/Ppv7TajZqd4MQafo7Nz/2bRMNTbD9BVW/JTRr6kjwETtrrX kW1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790029548; x=1790634348; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Wtx8XxjWiahHO9saGrrA8bVtKn979Y+PzPTB5vfUlfs=; b=N1CcFhhZxoCyKvh5EzeitgXr5Cpfmaex+RhmDBVz8E6VU1V+LCBg6GUcy6lN87ktkg DQHqAqE50tlHLeOzCtWvpne/QjIa9dIIn2s/cIBOBz5wvb39xfmHeVxpoVM00PE/FzQ7 O2BpvrpWe0SpiepMdjDQqOxedeh29FvelOkDH1+qTeEN0HOL9ALqf52n0wBOTSZ3Gr6y O6BgrMtFlVNBPXKc1NOlN9p6eXrlrBG0zmIvCpBF5RSGhYwtE/ydHWxxjmjcQrzweYrE BSuwKdr7UQd8ogHHefi3+QfUDkeltndPjt24lwVb03sj547V2CDFJRfptWMcssLJHnuH RQjg== X-Forwarded-Encrypted: i=1; AKwUvBwZAr6+tNyXbr1qWVGcNIixcac8o/7hPET/AGbsPO/6exNLoFOD2Ozu9B+kHk/05LKN+RTGdTkcNIGkndA=@vger.kernel.org X-Gm-Message-State: AFuF++mPKFDN07NA9oczCF/cHR7i3uSYkdak/bPeMcX7IWiV6FOUZfot qxof9qI/2XQlcp3p/udf+olVMeM2EuZ8IR/tr1LYNRDCUutASNoOIisE X-Gm-Gg: AYBFou3LOj/e6I+ubUlzSSNITOkmqW8exugrKx4NAnuQPhqgJ0Ar2DHmHgWafxNrApK P3Uws1H2Dr3AFsjNnzqz8Pd/tJY7eUdeTcQGKobGgldhbFLrcOxXtgoltVykWzesEJxh6uKcoOc 8pgTO96UGWRbXL3vmdnUdHY8trZDDwzX6HXalAumgZQ62ryrNru20s4qDjM/a1hlv5flPtNGNnK hkSibByCCx8d4PlIcs/aGx2ckwwI5GRlCs5Np1N8nwQExhBQhSzVemPXMewkMET2/sGB706Zy3P B8dRVWMIN+0G+awTsHeXaje/IkytkHL8IgL6jI9FEOPCERGk6Hz6nsY3hX04QNHK+HbqIog3wld bIJtle76q5KM0QU59JOLPzwChnfME3bnTRgNO5MVvkN5skN4RCnLHInciC/AVKM/uML5b3gwHIb W1Q/ELdqHWGjGpM9S8GGW73kTxPpcOTHeA7S6YEwF7vvbcFvVQZcASU2qaY4vINtoWdcyYyOvp+ 9+rwPiKZh2RBaksrbFGEsqzksVHLXIerin2r8ls66hHSC/KS0gDc8o3S+JSQCFs1hXf22Uav0q8 ZCGATgonK8DHfk5TNp1e4l8Kmz77PhMK6hJC8q/BY1QV72rQ X-Received: by 2002:a17:90b:3c05:b0:39e:218c:d47c with SMTP id 98e67ed59e1d1-39e54f42eddmr21948184a91.9.1790029547598; Mon, 21 Sep 2026 15:25:47 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a06cb7dacfsm12607a91.4.2026.09.21.15.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 15:25:46 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Vinod Koul , Frank Li , Xuelin Shi , Harninder Rai , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv8] dmaengine: fsl_raid: check fsl_re_chan_probe() return value Date: Mon, 21 Sep 2026 15:25:44 -0700 Message-ID: <20260921222544.52655-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" fsl_re_probe() ignores the return value of fsl_re_chan_probe() and unconditionally increments total_chans. When a channel fails to probe (for example, an IRQ mapping failure) its re_jrs[] slot is left NULL, yet total_chans still advances, so fsl_re_remove_chan() later dereferences the NULL pointer during device removal. Check return value and only count successfully probed channels, and guard fsl_re_remove() against NULL entries. Fixes: ad80da658bbc ("dmaengine: Driver support for FSL RaidEngine device.") Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev --- v8: handle channel unwinding in fsl_re_probe v7: handle differently based on sashiko review v6: increment ridx before continue; v5: put some stuff on one line for easier readability. v4: use break; v3: fix sashiko review v2: fix description drivers/dma/fsl_raid.c | 67 ++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c index 9cc289f7129e..a8f448f69586 100644 --- a/drivers/dma/fsl_raid.c +++ b/drivers/dma/fsl_raid.c @@ -687,7 +687,6 @@ static int fsl_re_chan_probe(struct platform_device *of= dev, goto err_free; } =20 - re_priv->re_jrs[q] =3D chan; chan->chan.device =3D dma_dev; chan->chan.private =3D chan; chan->dev =3D chandev; @@ -741,6 +740,11 @@ static int fsl_re_chan_probe(struct platform_device *o= fdev, /* Enable RE/CHAN */ out_be32(&chan->jrregs->jr_command, FSL_RE_ENABLE); =20 + /* Only record the channel once it is fully initialized, so the + * cleanup paths never touch a partially-probed ring. + */ + re_priv->re_jrs[q] =3D chan; + return 0; =20 err_free_1: @@ -750,6 +754,17 @@ static int fsl_re_chan_probe(struct platform_device *o= fdev, return ret; } =20 +static void fsl_re_remove_chan(struct fsl_re_chan *chan) +{ + tasklet_kill(&chan->irqtask); + + dma_pool_free(chan->re_dev->hw_desc_pool, chan->inb_ring_virt_addr, + chan->inb_phys_addr); + + dma_pool_free(chan->re_dev->hw_desc_pool, chan->oub_ring_virt_addr, + chan->oub_phys_addr); +} + /* Probe function for RAID Engine */ static int fsl_re_probe(struct platform_device *ofdev) { @@ -759,7 +774,7 @@ static int fsl_re_probe(struct platform_device *ofdev) u32 off; u8 ridx =3D 0; struct dma_device *dma_dev; - int rc; + int rc, i; struct device *dev =3D &ofdev->dev; =20 /* IOMAP the entire RAID Engine region */ @@ -832,33 +847,46 @@ static int fsl_re_probe(struct platform_device *ofdev) rc =3D of_property_read_u32(np, "reg", &off); if (rc) { dev_err(dev, "Reg property not found in JQ node\n"); - return -ENODEV; + rc =3D -ENODEV; + goto err_unwind; } /* Find out the Job Rings present under each JQ */ for_each_child_of_node(np, child) { - rc =3D of_device_is_compatible(child, - "fsl,raideng-v1.0-job-ring"); - if (rc) { - fsl_re_chan_probe(ofdev, child, ridx++, off); - re_priv->total_chans++; + if (!of_device_is_compatible(child, "fsl,raideng-v1.0-job-ring")) + continue; + + if (ridx >=3D FSL_RE_MAX_CHANS) { + dev_warn(dev, "too many job rings, max %d\n", FSL_RE_MAX_CHANS); + of_node_put(child); + break; } + + rc =3D fsl_re_chan_probe(ofdev, child, ridx, off); + if (rc) + dev_err(dev, "job ring %d probe failed: %d\n", ridx, rc); + re_priv->total_chans++; + ridx++; } } =20 - dma_async_device_register(dma_dev); + rc =3D dma_async_device_register(dma_dev); + if (rc) + goto err_unwind; =20 return 0; -} - -static void fsl_re_remove_chan(struct fsl_re_chan *chan) -{ - tasklet_kill(&chan->irqtask); =20 - dma_pool_free(chan->re_dev->hw_desc_pool, chan->inb_ring_virt_addr, - chan->inb_phys_addr); +err_unwind: + /* + * Tear down any channels that were successfully probed before the + * error. fsl_re_chan_probe() already frees its own resources on + * failure, so only fully-initialized channels in re_jrs[] need + * cleanup here; otherwise their IRQs and DMA ring memory leak. + */ + for (i =3D 0; i < re_priv->total_chans; i++) + if (re_priv->re_jrs[i]) + fsl_re_remove_chan(re_priv->re_jrs[i]); =20 - dma_pool_free(chan->re_dev->hw_desc_pool, chan->oub_ring_virt_addr, - chan->oub_phys_addr); + return rc; } =20 static void fsl_re_remove(struct platform_device *ofdev) @@ -872,7 +900,8 @@ static void fsl_re_remove(struct platform_device *ofdev) =20 /* Cleanup chan related memory areas */ for (i =3D 0; i < re_priv->total_chans; i++) - fsl_re_remove_chan(re_priv->re_jrs[i]); + if (re_priv->re_jrs[i]) + fsl_re_remove_chan(re_priv->re_jrs[i]); =20 /* Unregister the driver */ dma_async_device_unregister(&re_priv->dma_dev); --=20 2.55.0