* [PATCH] spi: spi-mem: Compute length only when needed @ 2020-02-28 16:07 Tudor.Ambarus-UWL1GkI3JZL3oGB3hsPCZA [not found] ` <20200228160735.1565047-1-tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> 0 siblings, 1 reply; 2+ messages in thread From: Tudor.Ambarus-UWL1GkI3JZL3oGB3hsPCZA @ 2020-02-28 16:07 UTC (permalink / raw) To: broonie-DgEjT+Ai2ygdnm+yROfE0A, linux-spi-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA Cc: Tudor.Ambarus-UWL1GkI3JZL3oGB3hsPCZA From: Tudor Ambarus <tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> When adjust_op_size is defined, len is never used. Move the len computation where it's actually used. Signed-off-by: Tudor Ambarus <tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> --- drivers/spi/spi-mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 3c46747bacb1..adaa0c49f966 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -418,12 +418,13 @@ int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op) struct spi_controller *ctlr = mem->spi->controller; size_t len; - len = sizeof(op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; - if (ctlr->mem_ops && ctlr->mem_ops->adjust_op_size) return ctlr->mem_ops->adjust_op_size(mem, op); if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) { + len = sizeof(op->cmd.opcode) + op->addr.nbytes + + op->dummy.nbytes; + if (len > spi_max_transfer_size(mem->spi)) return -EINVAL; -- 2.23.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
[parent not found: <20200228160735.1565047-1-tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org>]
* Applied "spi: spi-mem: Compute length only when needed" to the spi tree [not found] ` <20200228160735.1565047-1-tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> @ 2020-02-28 18:25 ` Mark Brown 0 siblings, 0 replies; 2+ messages in thread From: Mark Brown @ 2020-02-28 18:25 UTC (permalink / raw) To: Tudor Ambarus Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-spi-u79uwXL29TY76Z2rM5mHXA, Mark Brown, Tudor.Ambarus-UWL1GkI3JZL3oGB3hsPCZA The patch spi: spi-mem: Compute length only when needed has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c0e035ac56680e74b27fc218c07e70f4b9b8b7a5 Mon Sep 17 00:00:00 2001 From: Tudor Ambarus <tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> Date: Fri, 28 Feb 2020 16:07:44 +0000 Subject: [PATCH] spi: spi-mem: Compute length only when needed When adjust_op_size is defined, len is never used. Move the len computation where it's actually used. Signed-off-by: Tudor Ambarus <tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> Link: https://lore.kernel.org/r/20200228160735.1565047-1-tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- drivers/spi/spi-mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 3c46747bacb1..adaa0c49f966 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -418,12 +418,13 @@ int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op) struct spi_controller *ctlr = mem->spi->controller; size_t len; - len = sizeof(op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; - if (ctlr->mem_ops && ctlr->mem_ops->adjust_op_size) return ctlr->mem_ops->adjust_op_size(mem, op); if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) { + len = sizeof(op->cmd.opcode) + op->addr.nbytes + + op->dummy.nbytes; + if (len > spi_max_transfer_size(mem->spi)) return -EINVAL; -- 2.20.1 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-28 18:25 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-28 16:07 [PATCH] spi: spi-mem: Compute length only when needed Tudor.Ambarus-UWL1GkI3JZL3oGB3hsPCZA [not found] ` <20200228160735.1565047-1-tudor.ambarus-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org> 2020-02-28 18:25 ` Applied "spi: spi-mem: Compute length only when needed" to the spi tree Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).