aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-27 17:23:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-27 18:26:11 -0400
commit287980e49ffc0f6d911601e7e352a812ed27768e (patch)
treea906f835eb5be85dca4fd0c9c6f21b8f60920424 /drivers/dma
parent7ded384a12688c2a86b618da16bc87713404dfcc (diff)
remove lots of IS_ERR_VALUE abuses
Most users of IS_ERR_VALUE() in the kernel are wrong, as they pass an 'int' into a function that takes an 'unsigned long' argument. This happens to work because the type is sign-extended on 64-bit architectures before it gets converted into an unsigned type. However, anything that passes an 'unsigned short' or 'unsigned int' argument into IS_ERR_VALUE() is guaranteed to be broken, as are 8-bit integers and types that are wider than 'unsigned long'. Andrzej Hajda has already fixed a lot of the worst abusers that were causing actual bugs, but it would be nice to prevent any users that are not passing 'unsigned long' arguments. This patch changes all users of IS_ERR_VALUE() that I could find on 32-bit ARM randconfig builds and x86 allmodconfig. For the moment, this doesn't change the definition of IS_ERR_VALUE() because there are probably still architecture specific users elsewhere. Almost all the warnings I got are for files that are better off using 'if (err)' or 'if (err < 0)'. The only legitimate user I could find that we get a warning for is the (32-bit only) freescale fman driver, so I did not remove the IS_ERR_VALUE() there but changed the type to 'unsigned long'. For 9pfs, I just worked around one user whose calling conventions are so obscure that I did not dare change the behavior. I was using this definition for testing: #define IS_ERR_VALUE(x) ((unsigned long*)NULL == (typeof (x)*)NULL && \ unlikely((unsigned long long)(x) >= (unsigned long long)(typeof(x))-MAX_ERRNO)) which ends up making all 16-bit or wider types work correctly with the most plausible interpretation of what IS_ERR_VALUE() was supposed to return according to its users, but also causes a compile-time warning for any users that do not pass an 'unsigned long' argument. I suggested this approach earlier this year, but back then we ended up deciding to just fix the users that are obviously broken. After the initial warning that caused me to get involved in the discussion (fs/gfs2/dir.c) showed up again in the mainline kernel, Linus asked me to send the whole thing again. [ Updated the 9p parts as per Al Viro - Linus ] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Andrzej Hajda <a.hajda@samsung.com> Cc: Andrew Morton <akpm@linux-foundation.org> Link: https://lkml.org/lkml/2016/1/7/363 Link: https://lkml.org/lkml/2016/5/27/486 Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> # For nvmem part Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/sun4i-dma.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
index e0df233dde92..57aa227bfadb 100644
--- a/drivers/dma/sun4i-dma.c
+++ b/drivers/dma/sun4i-dma.c
@@ -461,25 +461,25 @@ generate_ndma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
461 461
462 /* Source burst */ 462 /* Source burst */
463 ret = convert_burst(sconfig->src_maxburst); 463 ret = convert_burst(sconfig->src_maxburst);
464 if (IS_ERR_VALUE(ret)) 464 if (ret < 0)
465 goto fail; 465 goto fail;
466 promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret); 466 promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
467 467
468 /* Destination burst */ 468 /* Destination burst */
469 ret = convert_burst(sconfig->dst_maxburst); 469 ret = convert_burst(sconfig->dst_maxburst);
470 if (IS_ERR_VALUE(ret)) 470 if (ret < 0)
471 goto fail; 471 goto fail;
472 promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret); 472 promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
473 473
474 /* Source bus width */ 474 /* Source bus width */
475 ret = convert_buswidth(sconfig->src_addr_width); 475 ret = convert_buswidth(sconfig->src_addr_width);
476 if (IS_ERR_VALUE(ret)) 476 if (ret < 0)
477 goto fail; 477 goto fail;
478 promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret); 478 promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
479 479
480 /* Destination bus width */ 480 /* Destination bus width */
481 ret = convert_buswidth(sconfig->dst_addr_width); 481 ret = convert_buswidth(sconfig->dst_addr_width);
482 if (IS_ERR_VALUE(ret)) 482 if (ret < 0)
483 goto fail; 483 goto fail;
484 promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret); 484 promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
485 485
@@ -518,25 +518,25 @@ generate_ddma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
518 518
519 /* Source burst */ 519 /* Source burst */
520 ret = convert_burst(sconfig->src_maxburst); 520 ret = convert_burst(sconfig->src_maxburst);
521 if (IS_ERR_VALUE(ret)) 521 if (ret < 0)
522 goto fail; 522 goto fail;
523 promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret); 523 promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
524 524
525 /* Destination burst */ 525 /* Destination burst */
526 ret = convert_burst(sconfig->dst_maxburst); 526 ret = convert_burst(sconfig->dst_maxburst);
527 if (IS_ERR_VALUE(ret)) 527 if (ret < 0)
528 goto fail; 528 goto fail;
529 promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret); 529 promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
530 530
531 /* Source bus width */ 531 /* Source bus width */
532 ret = convert_buswidth(sconfig->src_addr_width); 532 ret = convert_buswidth(sconfig->src_addr_width);
533 if (IS_ERR_VALUE(ret)) 533 if (ret < 0)
534 goto fail; 534 goto fail;
535 promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret); 535 promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
536 536
537 /* Destination bus width */ 537 /* Destination bus width */
538 ret = convert_buswidth(sconfig->dst_addr_width); 538 ret = convert_buswidth(sconfig->dst_addr_width);
539 if (IS_ERR_VALUE(ret)) 539 if (ret < 0)
540 goto fail; 540 goto fail;
541 promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret); 541 promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
542 542