Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of: restricted dma: Fix condition for rmem init

of_dma_set_restricted_buffer fails to handle negative return values from
of_property_count_elems_of_size, e.g. when the property does not exist.
This results in an attempt to assign a non-existent reserved memory
region to the device and a warning being printed. Fix the condition to
take negative values into account.

Fixes: f3cfd136aef0 ("of: restricted dma: Don't fail device probe on rmem init failure")
Cc: Will Deacon <will@kernel.org>
Signed-off-by: David Brazdil <dbrazdil@google.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210917131423.2760155-1-dbrazdil@google.com
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

David Brazdil and committed by
Rob Herring
31c8025f c8087adc

+5 -1
+5 -1
drivers/of/device.c
··· 85 85 break; 86 86 } 87 87 88 - if (i != count && of_reserved_mem_device_init_by_idx(dev, of_node, i)) 88 + /* 89 + * Attempt to initialize a restricted-dma-pool region if one was found. 90 + * Note that count can hold a negative error code. 91 + */ 92 + if (i < count && of_reserved_mem_device_init_by_idx(dev, of_node, i)) 89 93 dev_warn(dev, "failed to initialise \"restricted-dma-pool\" memory node\n"); 90 94 } 91 95