From patchwork Sat Dec 14 22:52:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 850901 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 D17F61B395D for ; Sat, 14 Dec 2024 22:52:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734216733; cv=none; b=T+zXv8nt9dRIUIPABdQRTHbjImQvscR3a5p3RS+iPfoe3x6fWRXgbk+JXpRLoDgOybg2oh3Q5ne4rm2m7UJnOZtIUgtQQOK9hHDZCFc1f4+nEFm+37b3CWpnO9N3wJnM/J1RqmKmRBIYKQnC5z8Fibn/ZsfbskO9kqXzJ6ETlng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734216733; c=relaxed/simple; bh=/D/vj4XanEKHzbb5zMRfqXPQ8+ADXufv99FkOEAVtx0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=ofJBLrZGZ1FVKAQp0FHtUlb764MGbMBtAn3SC4fD1k4lkM9hQpWk6si44DfB4SrxxeGQOSY9sBp87EMjSZ2k0GkxZPngCEEazhqOrJCOcgSOsTpjm228X183hlzWjTwgLs/q/zAp0JlaN6RTnvOVakWb0nCZ3HkQUlRcuDU+flg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=YgOz3rFe; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YgOz3rFe" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43634b570c1so8387585e9.0 for ; Sat, 14 Dec 2024 14:52:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734216729; x=1734821529; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=L02UQRlh3qmNnFOiOhKbVlklLsrwrslECaPK4JYFGvM=; b=YgOz3rFe3Ln/pzB3VB3sP/waS0avRJUBhaioFDi3yAx90A5X28+7zg+kio8YJqx+nH QvckLiKIehS/fSBmhQgvFa8q2pn/D8+WdWb6ONMjd6rFX34tilaqIgrCe1qSXfqHkQg4 hdblp9ebFL/3kW21d8u+yLBReop0yKVqbsD5rIhBeJh6XAv1gL5G8Ae3QlVyoh4H83gh 78HpHpVZJi7hJxx5g4pGEuF8/E4qAtnTzZkXjvcwjLHURL4dSdsneInPIUZqjsmiCCYd 9sq4+KUQ2p4vGvQymsZ6QSsppaovvvqt+Bi/UCBtRw0d2uk3/yFI4SN5L0Lt0chH32fq nH1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734216729; x=1734821529; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L02UQRlh3qmNnFOiOhKbVlklLsrwrslECaPK4JYFGvM=; b=CYJldxEzFlQT2TIRIDlSJESEm2nWa+3vn+pkO5R9pdqJH3tNosPdEuLcWShc+DkTHy zuNHiebkDUfIn9BKh/PCf8W+AzOpqj31MAr3LuFo3vANZaDURI959oc/bMB7GrYq1qOn fhIZgJAnQyPizH4VDygrYlwnRQzV3iQeda0yi2vLvTMEBciIQYvC+zt/9tsNvJKU/bEO T06p/k8kXX2siKGQH7yN7OoZQA1FMIL/bCuV1f/TgRvxxxxzKxI2fSBb+SXxt72vkTOI cQs7pNg6vZdK/reTg36irjWJ8clkD6AmicQcvdjDYzA8sAl6CDkDG+P7BJ4WEUxnwkQH rtBw== X-Gm-Message-State: AOJu0YzSoRFoYO3XwBIrbNUl3tWVkQ8isHeHDoD9pLTjC85aXp0AVZUI Xvzm33JU8dDnNZqGdcFUOZWL86ESzseMgs+764+ui+NZ3+M7IyVEcbo3x5rkQNA= X-Gm-Gg: ASbGncvW2qx/ENaYDqUnF68FovpJH1vUefA0nx4nFbDgt0eRchZOger8CQX+DU0vgaY 324LdeKLEYld4k+dIT3PpkmEN4tJ+z5n2nddXYjeAc3iq9gPgCcFOwbHXnljDPkgn+gdCpwga7f xA/Rrh8JeK2Og6a5mLYoUNNB48z9z4V1trUh1kMBEGjKC+MJ0B4PHo/3ijFsIVpWCSrEJVg+lHe H9qks8qqrEduwHDA/vZRlXaemFIUu6NvZaRqWMvzFmlAXYlXHdmcno9U3Kg8QqKWg== X-Google-Smtp-Source: AGHT+IG7fJzmsRfOAoWZ0xtBW1irRd+OIJaddSdUEg+7EScA+wo3w5PtT+D0S/aXRhqHYmUjFI8g4w== X-Received: by 2002:a05:600c:b9b:b0:434:fdf3:2c26 with SMTP id 5b1f17b1804b1-4362aa6805bmr62263685e9.19.1734216729211; Sat, 14 Dec 2024 14:52:09 -0800 (PST) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4362557c457sm92719445e9.15.2024.12.14.14.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2024 14:52:08 -0800 (PST) From: Bryan O'Donoghue Date: Sat, 14 Dec 2024 22:52:07 +0000 Subject: [PATCH] Revert "media: qcom: camss: Restructure camss_link_entities" Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241214-b4-linux-next-revert-link-freq-v1-1-5e970d05dfcd@linaro.org> X-B4-Tracking: v=1; b=H4sIABYMXmcC/x2N0QrCMAxFf2XkeYE2Rgr+iuxh1VSDUjXtRmHs3 60+ngvnng2KmEqB07CByapFX7mDHwe43Od8E9RrZyBH7MkzRsan5qVhllaxK2L1tzwwmXww8By PiVI4OIJ+8jZJ2v6B87TvX2Lfg6lwAAAA X-Change-ID: 20241214-b4-linux-next-revert-link-freq-74ab5f2f7302 To: Robert Foss , Todor Tomov , Mauro Carvalho Chehab , Hans Verkuil , Suresh Vankadara , Vikram Sharma , Trishansh Bhardwaj Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15-dev-dedf8 This reverts commit cc1ecabe67d92a2da0b0402f715598e8dbdc3b9e. This commit has a basic flaw in that it relies on camss->res->csid_num as a control to index the array camss->vfe[i]. Testing on a platform where csid_num > vfe_num showed this bug up. camss->vfe should only be indexed by camss->res->vfe_num. Since this commit is meant to make the code be more readable reverting will simply restore the previous correct bounds checking. We can make another pass at making camss_link_entities look prettier but, for now we should zap the bug introduced. Fixes: cc1ecabe67d9 ("media: qcom: camss: Restructure camss_link_entities") --- Testing this commit out as I was adding in more CSID devices to my working x1e tree I noticed a NULL pointer dereference in camss_link_entities. Investigating I discovered the following indexing error: > + for (i = 0; i < camss->res->csid_num; i++) { > + if (camss->ispif) > + line_num = camss->ispif->line_num; > + else > + line_num = camss->vfe[i].res->line_num; This statement is incorrect, you are indexing vfe[] with a control derived from csid_num. Below is the statement removed. > - for (i = 0; i < camss->res->csid_num; i++) > - for (k = 0; k < camss->res->vfe_num; k++) > - for (j = 0; j < camss->vfe[k].res->line_num; j++) { As soon as csid_num > ARRAY_SIZE(vfe) the code breaks. The commit is in linux-next but not yet in linux-stable so I'm not quite sure what to do with a Fixes: tag nothing I think. In any case we should revert this one before it hits stable. Link: https://lore.kernel.org/linux-arm-msm/1a570c17-c501-4a29-a4f7-020f41563f3d@linaro.org Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss.c | 155 ++++++++++-------------------- 1 file changed, 52 insertions(+), 103 deletions(-) --- base-commit: 4176cf5c5651c33769de83bb61b0287f4ec7719f change-id: 20241214-b4-linux-next-revert-link-freq-74ab5f2f7302 Best regards, diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 004a74f6b2f6ce7eef15765ad1eadc14a08a3908..a85e9df0f301a933d7e47e07b9fec535819aeb14 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -2298,6 +2298,7 @@ static int camss_init_subdevices(struct camss *camss) } /* + * camss_link_entities - Register subdev nodes and create links * camss_link_err - print error in case link creation fails * @src_name: name for source of the link * @sink_name: name for sink of the link @@ -2315,64 +2316,14 @@ inline void camss_link_err(struct camss *camss, } /* - * camss_link_entities_csid - Register subdev nodes and create links - * @camss: CAMSS device - * - * Return 0 on success or a negative error code on failure - */ -static int camss_link_entities_csid(struct camss *camss) -{ - struct media_entity *src_entity; - struct media_entity *sink_entity; - int ret, line_num; - u16 sink_pad; - u16 src_pad; - int i, j; - - for (i = 0; i < camss->res->csid_num; i++) { - if (camss->ispif) - line_num = camss->ispif->line_num; - else - line_num = camss->vfe[i].res->line_num; - - src_entity = &camss->csid[i].subdev.entity; - for (j = 0; j < line_num; j++) { - if (camss->ispif) { - sink_entity = &camss->ispif->line[j].subdev.entity; - src_pad = MSM_CSID_PAD_SRC; - sink_pad = MSM_ISPIF_PAD_SINK; - } else { - sink_entity = &camss->vfe[i].line[j].subdev.entity; - src_pad = MSM_CSID_PAD_FIRST_SRC + j; - sink_pad = MSM_VFE_PAD_SINK; - } - - ret = media_create_pad_link(src_entity, - src_pad, - sink_entity, - sink_pad, - 0); - if (ret < 0) { - camss_link_err(camss, src_entity->name, - sink_entity->name, - ret); - return ret; - } - } - } - - return 0; -} - -/* - * camss_link_entities_csiphy - Register subdev nodes and create links + * camss_link_entities - Register subdev nodes and create links * @camss: CAMSS device * * Return 0 on success or a negative error code on failure */ -static int camss_link_entities_csiphy(struct camss *camss) +static int camss_link_entities(struct camss *camss) { - int i, j; + int i, j, k; int ret; for (i = 0; i < camss->res->csiphy_num; i++) { @@ -2392,68 +2343,66 @@ static int camss_link_entities_csiphy(struct camss *camss) } } - return 0; -} - -/* - * camss_link_entities_ispif - Register subdev nodes and create links - * @camss: CAMSS device - * - * Return 0 on success or a negative error code on failure - */ -static int camss_link_entities_ispif(struct camss *camss) -{ - int i, j, k; - int ret; - - for (i = 0; i < camss->ispif->line_num; i++) { - for (k = 0; k < camss->res->vfe_num; k++) { - for (j = 0; j < camss->vfe[k].res->line_num; j++) { - struct v4l2_subdev *ispif = &camss->ispif->line[i].subdev; - struct v4l2_subdev *vfe = &camss->vfe[k].line[j].subdev; - - ret = media_create_pad_link(&ispif->entity, - MSM_ISPIF_PAD_SRC, - &vfe->entity, - MSM_VFE_PAD_SINK, + if (camss->ispif) { + for (i = 0; i < camss->res->csid_num; i++) { + for (j = 0; j < camss->ispif->line_num; j++) { + ret = media_create_pad_link(&camss->csid[i].subdev.entity, + MSM_CSID_PAD_SRC, + &camss->ispif->line[j].subdev.entity, + MSM_ISPIF_PAD_SINK, 0); if (ret < 0) { - camss_link_err(camss, ispif->entity.name, - vfe->entity.name, + camss_link_err(camss, + camss->csid[i].subdev.entity.name, + camss->ispif->line[j].subdev.entity.name, ret); return ret; } } } + + for (i = 0; i < camss->ispif->line_num; i++) + for (k = 0; k < camss->res->vfe_num; k++) + for (j = 0; j < camss->vfe[k].res->line_num; j++) { + struct v4l2_subdev *ispif = &camss->ispif->line[i].subdev; + struct v4l2_subdev *vfe = &camss->vfe[k].line[j].subdev; + + ret = media_create_pad_link(&ispif->entity, + MSM_ISPIF_PAD_SRC, + &vfe->entity, + MSM_VFE_PAD_SINK, + 0); + if (ret < 0) { + camss_link_err(camss, ispif->entity.name, + vfe->entity.name, + ret); + return ret; + } + } + } else { + for (i = 0; i < camss->res->csid_num; i++) + for (k = 0; k < camss->res->vfe_num; k++) + for (j = 0; j < camss->vfe[k].res->line_num; j++) { + struct v4l2_subdev *csid = &camss->csid[i].subdev; + struct v4l2_subdev *vfe = &camss->vfe[k].line[j].subdev; + + ret = media_create_pad_link(&csid->entity, + MSM_CSID_PAD_FIRST_SRC + j, + &vfe->entity, + MSM_VFE_PAD_SINK, + 0); + if (ret < 0) { + camss_link_err(camss, csid->entity.name, + vfe->entity.name, + ret); + return ret; + } + } } return 0; } -/* - * camss_link_entities - Register subdev nodes and create links - * @camss: CAMSS device - * - * Return 0 on success or a negative error code on failure - */ -static int camss_link_entities(struct camss *camss) -{ - int ret; - - ret = camss_link_entities_csiphy(camss); - if (ret < 0) - return ret; - - ret = camss_link_entities_csid(camss); - if (ret < 0) - return ret; - - if (camss->ispif) - ret = camss_link_entities_ispif(camss); - - return ret; -} - /* * camss_register_entities - Register subdev nodes and create links * @camss: CAMSS device