Commit 2731835f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-fixes-for-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

 - Fix a possible (but unlikely) out-of-bounds read in interrupts
   parsing code

 - Add AT25 EEPROM "fujitsu,mb85rs256" compatible

 - Update Konrad Dybcio's email

* tag 'devicetree-fixes-for-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of/irq: Prevent device address out-of-bounds read in interrupt map walk
  dt-bindings: eeprom: at25: add fujitsu,mb85rs256 compatible
  dt-bindings: Batch-update Konrad Dybcio's email
parents 296c871d b739dffa
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Display Clock & Reset Controller on SM6350 title: Qualcomm Display Clock & Reset Controller on SM6350
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm display clock control module provides the clocks, resets and power Qualcomm display clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Global Clock & Reset Controller on MSM8994 title: Qualcomm Global Clock & Reset Controller on MSM8994
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm global clock control module provides the clocks, resets and power Qualcomm global clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Global Clock & Reset Controller on SM6125 title: Qualcomm Global Clock & Reset Controller on SM6125
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm global clock control module provides the clocks, resets and power Qualcomm global clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Global Clock & Reset Controller on SM6350 title: Qualcomm Global Clock & Reset Controller on SM6350
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm global clock control module provides the clocks, resets and power Qualcomm global clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller on SM6115 title: Qualcomm Graphics Clock & Reset Controller on SM6115
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm graphics clock control module provides clocks, resets and power Qualcomm graphics clock control module provides clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller on SM6125 title: Qualcomm Graphics Clock & Reset Controller on SM6125
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm graphics clock control module provides clocks and power domains on Qualcomm graphics clock control module provides clocks and power domains on
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Camera Clock & Reset Controller on SM6350 title: Qualcomm Camera Clock & Reset Controller on SM6350
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm camera clock control module provides the clocks, resets and power Qualcomm camera clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Display Clock & Reset Controller on SM6375 title: Qualcomm Display Clock & Reset Controller on SM6375
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm display clock control module provides the clocks, resets and power Qualcomm display clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Global Clock & Reset Controller on SM6375 title: Qualcomm Global Clock & Reset Controller on SM6375
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm global clock control module provides the clocks, resets and power Qualcomm global clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller on SM6375 title: Qualcomm Graphics Clock & Reset Controller on SM6375
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm graphics clock control module provides clocks, resets and power Qualcomm graphics clock control module provides clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm SM8350 Video Clock & Reset Controller title: Qualcomm SM8350 Video Clock & Reset Controller
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm video clock control module provides the clocks, resets and power Qualcomm video clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller on SM8450 title: Qualcomm Graphics Clock & Reset Controller on SM8450
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm graphics clock control module provides the clocks, resets and power Qualcomm graphics clock control module provides the clocks, resets and power
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm SM6375 Display MDSS title: Qualcomm SM6375 Display MDSS
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: description:
SM6375 MSM Mobile Display Subsystem (MDSS), which encapsulates sub-blocks SM6375 MSM Mobile Display Subsystem (MDSS), which encapsulates sub-blocks
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: ASUS Z00T TM5P5 NT35596 5.5" 1080×1920 LCD Panel title: ASUS Z00T TM5P5 NT35596 5.5" 1080×1920 LCD Panel
maintainers: maintainers:
- Konrad Dybcio <konradybcio@gmail.com> - Konrad Dybcio <konradybcio@kernel.org>
description: |+ description: |+
This panel seems to only be found in the Asus Z00T This panel seems to only be found in the Asus Z00T
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Sony TD4353 JDI 5 / 5.7" 2160x1080 MIPI-DSI Panel title: Sony TD4353 JDI 5 / 5.7" 2160x1080 MIPI-DSI Panel
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
The Sony TD4353 JDI is a 5 (XZ2c) / 5.7 (XZ2) inch 2160x1080 The Sony TD4353 JDI is a 5 (XZ2c) / 5.7 (XZ2) inch 2160x1080
......
...@@ -28,6 +28,7 @@ properties: ...@@ -28,6 +28,7 @@ properties:
- anvo,anv32e61w - anvo,anv32e61w
- atmel,at25256B - atmel,at25256B
- fujitsu,mb85rs1mt - fujitsu,mb85rs1mt
- fujitsu,mb85rs256
- fujitsu,mb85rs64 - fujitsu,mb85rs64
- microchip,at25160bn - microchip,at25160bn
- microchip,25lc040 - microchip,25lc040
......
...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC7280 ...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC7280
maintainers: maintainers:
- Bjorn Andersson <andersson@kernel.org> - Bjorn Andersson <andersson@kernel.org>
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
RPMh interconnect providers support system bandwidth requirements through RPMh interconnect providers support system bandwidth requirements through
......
...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC8280XP ...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SC8280XP
maintainers: maintainers:
- Bjorn Andersson <andersson@kernel.org> - Bjorn Andersson <andersson@kernel.org>
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
RPMh interconnect providers support system bandwidth requirements through RPMh interconnect providers support system bandwidth requirements through
......
...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SM8450 ...@@ -8,7 +8,7 @@ title: Qualcomm RPMh Network-On-Chip Interconnect on SM8450
maintainers: maintainers:
- Bjorn Andersson <andersson@kernel.org> - Bjorn Andersson <andersson@kernel.org>
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
RPMh interconnect providers support system bandwidth requirements through RPMh interconnect providers support system bandwidth requirements through
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies legacy IOMMU implementations title: Qualcomm Technologies legacy IOMMU implementations
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
Qualcomm "B" family devices which are not compatible with arm-smmu have Qualcomm "B" family devices which are not compatible with arm-smmu have
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. MDM9607 TLMM block title: Qualcomm Technologies, Inc. MDM9607 TLMM block
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: description:
Top Level Mode Multiplexer pin controller in Qualcomm MDM9607 SoC. Top Level Mode Multiplexer pin controller in Qualcomm MDM9607 SoC.
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. SM6350 TLMM block title: Qualcomm Technologies, Inc. SM6350 TLMM block
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: description:
Top Level Mode Multiplexer pin controller in Qualcomm SM6350 SoC. Top Level Mode Multiplexer pin controller in Qualcomm SM6350 SoC.
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. SM6375 TLMM block title: Qualcomm Technologies, Inc. SM6375 TLMM block
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@somainline.org> - Konrad Dybcio <konradybcio@kernel.org>
description: description:
Top Level Mode Multiplexer pin controller in Qualcomm SM6375 SoC. Top Level Mode Multiplexer pin controller in Qualcomm SM6375 SoC.
......
...@@ -8,7 +8,7 @@ title: Qualcomm Resource Power Manager (RPM) Processor/Subsystem ...@@ -8,7 +8,7 @@ title: Qualcomm Resource Power Manager (RPM) Processor/Subsystem
maintainers: maintainers:
- Bjorn Andersson <andersson@kernel.org> - Bjorn Andersson <andersson@kernel.org>
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
- Stephan Gerhold <stephan@gerhold.net> - Stephan Gerhold <stephan@gerhold.net>
description: | description: |
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. (QTI) RPM Master Stats title: Qualcomm Technologies, Inc. (QTI) RPM Master Stats
maintainers: maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org> - Konrad Dybcio <konradybcio@kernel.org>
description: | description: |
The Qualcomm RPM (Resource Power Manager) architecture includes a concept The Qualcomm RPM (Resource Power Manager) architecture includes a concept
......
...@@ -344,7 +344,8 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar ...@@ -344,7 +344,8 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
struct device_node *p; struct device_node *p;
const __be32 *addr; const __be32 *addr;
u32 intsize; u32 intsize;
int i, res; int i, res, addr_len;
__be32 addr_buf[3] = { 0 };
pr_debug("of_irq_parse_one: dev=%pOF, index=%d\n", device, index); pr_debug("of_irq_parse_one: dev=%pOF, index=%d\n", device, index);
...@@ -353,13 +354,19 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar ...@@ -353,13 +354,19 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
return of_irq_parse_oldworld(device, index, out_irq); return of_irq_parse_oldworld(device, index, out_irq);
/* Get the reg property (if any) */ /* Get the reg property (if any) */
addr = of_get_property(device, "reg", NULL); addr = of_get_property(device, "reg", &addr_len);
/* Prevent out-of-bounds read in case of longer interrupt parent address size */
if (addr_len > (3 * sizeof(__be32)))
addr_len = 3 * sizeof(__be32);
if (addr)
memcpy(addr_buf, addr, addr_len);
/* Try the new-style interrupts-extended first */ /* Try the new-style interrupts-extended first */
res = of_parse_phandle_with_args(device, "interrupts-extended", res = of_parse_phandle_with_args(device, "interrupts-extended",
"#interrupt-cells", index, out_irq); "#interrupt-cells", index, out_irq);
if (!res) if (!res)
return of_irq_parse_raw(addr, out_irq); return of_irq_parse_raw(addr_buf, out_irq);
/* Look for the interrupt parent. */ /* Look for the interrupt parent. */
p = of_irq_find_parent(device); p = of_irq_find_parent(device);
...@@ -389,7 +396,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar ...@@ -389,7 +396,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
/* Check if there are any interrupt-map translations to process */ /* Check if there are any interrupt-map translations to process */
res = of_irq_parse_raw(addr, out_irq); res = of_irq_parse_raw(addr_buf, out_irq);
out: out:
of_node_put(p); of_node_put(p);
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment