summaryrefslogtreecommitdiffstats
path: root/include/linux/ntb.h
diff options
context:
space:
mode:
authorSerge Semin <fancer.lancer@gmail.com>2017-12-06 17:31:54 +0300
committerJon Mason <jdmason@kudzu.us>2018-01-28 22:17:24 -0500
commitf1678a4c66a5c2cb43f744f7dc7e048d59690166 (patch)
treeab3025b16f95c20f786e988c5eb93feef9f61b57 /include/linux/ntb.h
parent417cf39cfea9c680aa7c278c8d8a0ca879cacf0a (diff)
downloadlinux-f1678a4c66a5c2cb43f744f7dc7e048d59690166.tar.gz
linux-f1678a4c66a5c2cb43f744f7dc7e048d59690166.tar.bz2
linux-f1678a4c66a5c2cb43f744f7dc7e048d59690166.zip
NTB: Fix UB/bug in ntb_mw_get_align()
Simple (1 << pidx) operation causes undefined behaviour when pidx >= 32. It must be casted to u64 to match the actual return value of ntb_link_is_up() method, so to have all the possible peer indexes covered and to get rid of undefined behaviour. Additionally there are special macros in "linux/bitops.h" to perform the bit-set-shift operations, so it's recommended to have them used for proper bit setting. Signed-off-by: Serge Semin <fancer.lancer@gmail.com> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'include/linux/ntb.h')
-rw-r--r--include/linux/ntb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index 21b1826a0953..181d16601dd9 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -767,7 +767,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
resource_size_t *size_align,
resource_size_t *size_max)
{
- if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
+ if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
return -ENOTCONN;
return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,