From patchwork Thu Oct 7 21:33:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 12543597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AA43C433FE for ; Thu, 7 Oct 2021 21:34:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 161C1610C7 for ; Thu, 7 Oct 2021 21:34:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239918AbhJGVf7 (ORCPT ); Thu, 7 Oct 2021 17:35:59 -0400 Received: from relay07.th.seeweb.it ([5.144.164.168]:52987 "EHLO relay07.th.seeweb.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234055AbhJGVf7 (ORCPT ); Thu, 7 Oct 2021 17:35:59 -0400 Received: from Marijn-Arch-PC.localdomain (94-209-165-62.cable.dynamic.v4.ziggo.nl [94.209.165.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id 71B273E7BE; Thu, 7 Oct 2021 23:34:02 +0200 (CEST) From: Marijn Suijten To: phone-devel@vger.kernel.org, Andy Gross , Bjorn Andersson , Rob Herring , Lee Jones , Daniel Thompson , Jingoo Han Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Pavel Dubrova , Marijn Suijten , Kiran Gunda , Bryan Wu , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2 00/13] backlight: qcom-wled: fix and solidify handling of enabled-strings Date: Thu, 7 Oct 2021 23:33:47 +0200 Message-Id: <20211007213400.258371-1-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org This patchset fixes WLED's handling of enabled-strings: besides some cleanup it is now actually possible to specify a non-contiguous array of enabled strings (not necessarily starting at zero) and the values from DT are now validated to prevent possible unexpected out-of-bounds register and array element accesses. Off-by-one mistakes in the maximum number of strings, also causing out-of-bounds access, have been addressed as well. Changes in v2: - Reordered patch 4/10 (Validate enabled string indices in DT) to sit before patch 1/10 (Pass number of elements to read to read_u32_array); - Pulled qcom,num-strings out of the DT enumeration parser, and moved it after qcom,enabled-strings parser to always have final sign-off over the number of strings; - Extra validation for this number of strings against qcom,enabled-strings; - Recombined patch 9 (Consistently use enabled-strings in set_brightness) and patch 10 (Consider enabled_strings in autodetection), which both solve the same problem in two different functions. In addition the autodetection code uses set_brightness as helper already; - Improved DT configurations for pmi8994 and pm660l, currently in 5.15 rc's. v1: https://lore.kernel.org/dri-devel/20211004192741.621870-1-marijn.suijten@somainline.org Marijn Suijten (13): backlight: qcom-wled: Validate enabled string indices in DT backlight: qcom-wled: Pass number of elements to read to read_u32_array backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion backlight: qcom-wled: Fix off-by-one maximum with default num_strings backlight: qcom-wled: Override default length with qcom,enabled-strings backlight: qcom-wled: Remove unnecessary 4th default string in WLED3 backlight: qcom-wled: Provide enabled_strings default for WLED 4 and 5 backlight: qcom-wled: Remove unnecessary double whitespace backlight: qcom-wled: Respect enabled-strings in set_brightness arm64: dts: qcom: pmi8994: Fix "eternal"->"external" typo in WLED node arm64: dts: qcom: pmi8994: Remove hardcoded linear WLED enabled-strings arm64: dts: qcom: Move WLED num-strings from pmi8994 to sony-xperia-tone arm64: dt: qcom: pm660l: Remove board-specific WLED configuration .../dts/qcom/msm8996-sony-xperia-tone.dtsi | 1 + arch/arm64/boot/dts/qcom/pm660l.dtsi | 7 - arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +- drivers/video/backlight/qcom-wled.c | 131 ++++++++++-------- 4 files changed, 73 insertions(+), 71 deletions(-) --- 2.33.0