From nobody Fri Jul 24 21:52:33 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 6E76E3AD51E for ; Fri, 24 Jul 2026 08:42:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882546; cv=none; b=VmzQ+cDe4caBfcjyb39JpD0dm5aOxT+dMSqKIHpIuBD/tBQAiCwndrDe2DBY63dxduyDNxt15ymTVJPBFSMs47tvduWu7bHxYO8AhdAhAp8hwfinuA2FgC6sMv8lwq/EM4/JLQ/tvNKAw4dwlvEYn8g4HNrnkWnuOoBaHn8bh5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882546; c=relaxed/simple; bh=Smtr9ZiEk4NVykysiAdvb4hU09zGhfZs6SaCt6pq7vg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=u/BoVbxvz5+QWomvZbGksviRQCvTY2DxL4yAu5Z2kFVbcaVelo/T81IEBK45fvyr3TQsKJn9swe6kJAhXCZ1v225V8ykWUrvkBwfbjhOqmlKdxF3A/9qzvLgZWrWYYGbuJdkI7i924cKnkD1cN7TU8ALYe8JcZ2vAV4cnthOuZc= 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=RaV5Ay26; arc=none smtp.client-ip=209.85.216.54 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="RaV5Ay26" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38dfe910e9dso131688a91.3 for ; Fri, 24 Jul 2026 01:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784882545; x=1785487345; 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=7jU8sAnxwGBoGejjvqvQlsAlOL13cJWzk28R/0LodGc=; b=RaV5Ay26dZbh1GPaH2DFD9jCdrdaYNER4lakQwitsMHtU2U868WJHExCDJvdXeNSLB C//UAeYJui5preaq7Vng7oe+yrMZ4KtLJIaqIHxeeoJcQQXCv1biUUdyEmZ5XUobCfOR ++5OOYwyL4n4Rcc+DJTX42og51skdjmc2YgUjWHewMHyFyG8HPaceLsxvTHVTZf6J9js zQcUB0s6TcQoeuo8KaFvyzHBo+C09dk3MThPeOsGeFXDg0IRxhrIWnG90P1XiLZq4t+r yZAejf/AqJngRFFdErkREjwOEw9IGXv6YNLl2IR6Lm8girYgz6FXSnl7bxnNCOtLAXNP zHxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784882545; x=1785487345; 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=7jU8sAnxwGBoGejjvqvQlsAlOL13cJWzk28R/0LodGc=; b=e74KB3Yhf/9OqaSWg5GeqWtpTR9T7KKnxi5VrRtD6Uqd2mqtneHTKqiuku3n2kI476 kyXWWfkZ9eyrp+Joa7PIvRittYarR7fcOQcQlSeZfQZnm+AruqJ5OKZugrI4REQygFpC 2wQWJE354lKhYP7j7rts31ySSyAOGOOrzDYv6q9U5/HU4K0dF12kS9xTg8nNC12MyoOM hpCUQCQfREaI/m3iPo4Ptf0j48q95dnny7Y2vAgM/bMRU1Qv10IxQ1Id/J31TJp62Pra 854sF40dBpWxCxFa5lak8y4wQUbKgl05Jxt6hhPTKNf8i07w6lYmDHG24IMi6Ol3NXxb NczQ== X-Forwarded-Encrypted: i=1; AHgh+RpmfL0g8kNHWI9xq3zMrtEJfwHylMyZorSGpFzDI0RB8qqtOykEOJtv8fIWrc9STH7WcOE95G2NhVJr/bI=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd9nUGM5XaUJ8FqYWsK8bLolD9HnLu4iZDwezeUCYQqkpH8QsH vxm88VoK2+NJXnLw4lHGrz6W1eQVhpG7DRSHLI1xqC+6tw+TVOPKdOH+yVQVFp0= X-Gm-Gg: AR+sD12fG9gl4aSll5r7rFcueP0mGGdJTYVQCJ9RiPJjXyvjsrDBP3yAmaaqAqo/n6c Qdc3/EKZjqh9C6TQKJhJ4vcTR9L8QjjD3GcaYLUQD+xTBNwpiUYEJgaVWHcxGN286oRRiWWoncQ V9cpZPpwRodt+01Og29smA9IW6qTOr47kpbXe90h+2j1v346dLi4sD1cigjE9CQYDvsaoE1Mxxn HxxSgNf0ayqFPliszsHdmrx12ZIlOEsC9cfEylGp92zO4Z8mPa5AoXj547vY00AaswNFfFJaMA+ 8vkKpR4xkNRUW72GMyIETCmcr6/ZPqL1vKnhEg0pFablbWCOxJ5MBlnSejg66jwFOsiqxoFVeRX N8wncBl1k+tMGjbQBli93phq3zzSOPyLaHOpsbbB3xrFYi6Hfpe93mnMmmmYe+O5UFsa74yTPd/ EKpk7aI2NcL/xteLNYB6W1bMAa8+0mU1CWP14qoQ== X-Received: by 2002:a17:90b:2d10:b0:380:9504:9780 with SMTP id 98e67ed59e1d1-38ec6631fe3mr6482760a91.29.1784882544572; Fri, 24 Jul 2026 01:42:24 -0700 (PDT) Received: from t-rex ([2401:4900:7b31:234e:4988:bf77:ef99:7f27]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13d130f55c6sm38261529c88.15.2026.07.24.01.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 01:42:23 -0700 (PDT) From: kr494167@gmail.com To: jassisinghbrar@gmail.com, gary.yang@cixtech.com, fugang.duan@cixtech.com Cc: cix-kernel-upstream@cixtech.com, peter.chen@cixtech.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Surendra Singh Chouhan Subject: [PATCH] mailbox: cix: validate channel parameters early and convert to dev_err_probe Date: Fri, 24 Jul 2026 14:12:15 +0530 Message-ID: <20260724084215.51749-1-kr494167@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" From: Surendra Singh Chouhan cix_mbox_startup() checked fast channel index constraints (index < 0 || index > CIX_MBOX_FAST_IDX) inside the channel switch block after calling request_irq(). If validation failed, it triggered a free_irq() cleanup path. Validating channel parameters prior to request_irq() avoids unnecessary IRQ registration/teardown churn. In addition, cix_mbox_probe() logged property errors referencing "cix,mbox_dir" (with an underscore) instead of the actual DT property name "cix,mbox-dir". Convert cix_mbox_probe() error paths to use dev_err_probe() and fix the DT property string spelling. Fixes: fe2aa2361ddb ("mailbox: add CIX mailbox driver") Signed-off-by: Surendra Singh Chouhan --- drivers/mailbox/cix-mailbox.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/mailbox/cix-mailbox.c b/drivers/mailbox/cix-mailbox.c index 43c76cdab24a..24cea67c407d 100644 --- a/drivers/mailbox/cix-mailbox.c +++ b/drivers/mailbox/cix-mailbox.c @@ -403,6 +403,13 @@ static int cix_mbox_startup(struct mbox_chan *chan) int index =3D cp->index, ret; u32 val; =20 + if (cp->type =3D=3D CIX_MBOX_TYPE_FAST && priv->dir =3D=3D CIX_MBOX_RX) { + if (index < 0 || index > CIX_MBOX_FAST_IDX) { + dev_err(priv->dev, "Invalid index %d\n", index); + return -EINVAL; + } + } + ret =3D request_irq(priv->irq, cix_mbox_isr, IRQF_NO_SUSPEND, dev_name(priv->dev), chan); if (ret) { @@ -448,11 +455,6 @@ static int cix_mbox_startup(struct mbox_chan *chan) case CIX_MBOX_TYPE_FAST: /* Only RX channel has intterupt */ if (priv->dir =3D=3D CIX_MBOX_RX) { - if (index < 0 || index > CIX_MBOX_FAST_IDX) { - dev_err(priv->dev, "Invalid index %d\n", index); - ret =3D -EINVAL; - goto failed; - } /* enable fast channel interrupt */ val =3D cix_mbox_read(priv, CIX_INT_ENABLE_SIDE_B); val |=3D CIX_FAST_CH_INT(index); @@ -587,19 +589,18 @@ static int cix_mbox_probe(struct platform_device *pde= v) if (priv->irq < 0) return priv->irq; =20 - if (device_property_read_string(dev, "cix,mbox-dir", &dir_str)) { - dev_err(priv->dev, "cix,mbox_dir property not found\n"); - return -EINVAL; - } + if (device_property_read_string(dev, "cix,mbox-dir", &dir_str)) + return dev_err_probe(dev, -EINVAL, + "cix,mbox-dir property not found\n"); =20 if (!strcmp(dir_str, "tx")) priv->dir =3D 0; else if (!strcmp(dir_str, "rx")) priv->dir =3D 1; - else { - dev_err(priv->dev, "cix,mbox_dir=3D%s is not expected\n", dir_str); - return -EINVAL; - } + else + return dev_err_probe(dev, -EINVAL, + "cix,mbox-dir=3D%s is not expected\n", + dir_str); =20 cix_mbox_init(priv); =20 @@ -613,9 +614,9 @@ static int cix_mbox_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); ret =3D devm_mbox_controller_register(dev, &priv->mbox); if (ret) - dev_err(dev, "Failed to register mailbox %d\n", ret); + return dev_err_probe(dev, ret, "Failed to register mailbox\n"); =20 - return ret; + return 0; } =20 static const struct of_device_id cix_mbox_dt_ids[] =3D { --=20 2.55.0