From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 1CF0829BDBF for ; Mon, 20 Jul 2026 20:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784578845; cv=none; b=DvVlzCJTy7TYjijosh4Uxqz8DwWbrZgJpqmxb78Wp1I5E3Q5cnhxjb9I8rbzhN+bhY5hLWctdIvDxa4MtV/O9bBDZu//qiJ0W7adBnAwjd+sfPhE3tb1vDArbrMnsaSvoXJUTiXJ7ddphm016q9x+FGmgDB4u2MeSyT4FNnQ7FI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784578845; c=relaxed/simple; bh=FG2nfinof6GfsPPeOY7nWqbpUaUdMm4IJzYEqU76HjA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uQCZDU9nFbj83k9HfI6VbcuQG3pWpO6V8oKpPXvhmlguiVXpqOd2BEc+7i1MWb/e+KQINEjbE7TZY4K9+vN8YPYPHIb+JClMLOZ+efOVTZ1LAqC4MP+es1UmNQt2596Q/0Bx2duzYfTJ6KyaJtoCHNeJYi24o6BP1u2EEfGBR34= 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=DLvCdnva; arc=none smtp.client-ip=209.85.214.169 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="DLvCdnva" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cf52d15d88so21090285ad.2 for ; Mon, 20 Jul 2026 13:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784578843; x=1785183643; 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=GvQnFfP3Es1W9NjaXYBktRw/N07DQf6zW551CWQwaBI=; b=DLvCdnva2VPVuiY1sNzm7XegL3G0x+Jo5VUFavll0/uoUL4d0WQX6JIR79aw8S02TP oTnMLVrJejwrxRPmE4fefovux3BastfW6LL1GT/MSwY9jRmsyVnYoMx72R4Kx4n2RESo qMV6iQtbPhhOhcSQfYdygLJ0TYYR8gk3aeigquSXaTpVT674hXAiZLt4jVN94heG1Xce G2XzvBCeG8CRoCE01gcJ8JdyPOeEJ0HShNZNJdgkoLnRAsrl78FsgceLGzoe92J1TEo4 x0KfNHscR5slf3oiSO7HLLf2KqGuZ+lzwXw+QIhXGG1WVOs95xO0+gpsLMYKjmqkjP/M 4AFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784578843; x=1785183643; 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=GvQnFfP3Es1W9NjaXYBktRw/N07DQf6zW551CWQwaBI=; b=MojMgPfNWdi3b0BlT2iZ56SXA5FgsFJLipMTVvcgyK21MdS61HGm3zKIeA792i12Ax Nmfdfm7MZ190WQS55E/E6GaaQ5O8TsYACzhjKE+vpMSXNswgP4uzN0lDCSj2DVHrDskG xdKkrLZAqRIyIGqQNzxBWhFcyyWmiVcbyL66y3Lw7Zrfrm4gateUdQRp4RNu7yUGAEd4 kPYw+LDf7yHzyGlEbLxTBQo/REI4VECHvB/LAtSHS43fgotscHfSPdOL1LdvpzDkZtO9 dZgEKTmwf46FIjCBpn4nZll+vdFSXEgu5Lp6pv116vjqufqGjHS4C3zR1sjiaBLxhBQO xcow== X-Forwarded-Encrypted: i=1; AHgh+RoToe/o1Mk6aNQB8PW6rpuw54fx38qB2m6iAfAdrxMoSuu99Rtx75Tf7MYyQ+VLXwqituiKd3cySqcXHFc=@vger.kernel.org X-Gm-Message-State: AOJu0Yzn9jn5kIpkPYcQHc/hKyjlOJq0qe2gyQjnHUxCL/wzG1zxT/co x9wfMsMGXzT6qIkkaaYMrfHeYNrUtc3+qjsgOGX3jN/iQZHCO1KmZlbw X-Gm-Gg: AR+sD13p0X0BsvodkPnWVqkdlFqsamfmKjhjoD8ua7bPcIP7eztTOGRUYNJ6Dy1y86u e548DQ5lxjZoJXykfQD7O/luJuzvis5u0SpMGy1xVsSIwqkbO7xWYviv1E5GWs05Gagau+Avcfe ZpfKID7og4juACtBhQ1o55Nnr5JZ/vclUvRUir6tuGrmyaeGEhWtoM+eoPzJLTxqyoPwHHWBJem +3vYI6RILPZ5tWwW6pzQf6oLyQNd3+SRbCiGfWrznb7ZYFsS6PLGljdTePbSe8Tha8zy5shtgPj uFmx5gwfriAIVECVC5ZaP/vd4/5EYpQsYmfZcpvLIX59DKlB6r0p5ReJpI5UvmPI2n6zD2KQqBp xkFuZVLOw3VqDSbbk8ewa2MJFze+tgrLfbqvqLnNaao/rugO4iCvdF/f0kYMZpxKZ5wpyYfulb8 tUQUxQT94WDutrmlYD+ZgP/GlMxW8zn+QTYzevnAa7FaHhzA+qBvzVgI1v62lmlynG9rJqMdCfp taXB7wyNqxolkWj/fLYF0Lz8CFLIZqeqsbXYuhtSIaSSJP2STIHulE= X-Received: by 2002:a17:903:1ae6:b0:2c9:aae1:a61c with SMTP id d9443c01a7336-2cf348a8c3amr167956745ad.20.1784578843294; Mon, 20 Jul 2026 13:20:43 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf34729df7sm63722835ad.63.2026.07.20.13.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 13:20:42 -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: [PATCHv2] dmaengine: fsl_raid: check fsl_re_chan_probe() return value Date: Mon, 20 Jul 2026 13:20:40 -0700 Message-ID: <20260720202040.2531311-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: 8bit 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 --- v2: fix description drivers/dma/fsl_raid.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c index bfaef6245695..30aaca81d855 100644 --- a/drivers/dma/fsl_raid.c +++ b/drivers/dma/fsl_raid.c @@ -841,10 +841,26 @@ static int fsl_re_probe(struct platform_device *ofdev) for_each_child_of_node(np, child) { rc = of_device_is_compatible(child, "fsl,raideng-v1.0-job-ring"); + if (!rc) + continue; + + if (ridx >= FSL_RE_MAX_CHANS) { + dev_err(dev, + "too many job rings, max %d\n", + FSL_RE_MAX_CHANS); + of_node_put(child); + return -EINVAL; + } + + rc = fsl_re_chan_probe(ofdev, child, ridx, off); if (rc) { - fsl_re_chan_probe(ofdev, child, ridx++, off); - re_priv->total_chans++; + dev_err(dev, + "job ring %d probe failed: %d\n", + ridx, rc); + continue; } + ridx++; + re_priv->total_chans++; } } @@ -875,7 +891,8 @@ static void fsl_re_remove(struct platform_device *ofdev) /* Cleanup chan related memory areas */ for (i = 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]); /* Unregister the driver */ dma_async_device_unregister(&re_priv->dma_dev); -- 2.55.0