lkml.org 
[lkml]   [2020]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 05/86] RDMA/core: Fix use of logical OR in get_new_pps
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 4ca501d6aaf21de31541deac35128bbea8427aa6 ]

    Clang warns:

    ../drivers/infiniband/core/security.c:351:41: warning: converting the
    enum constant to a boolean [-Wint-in-bool-context]
    if (!(qp_attr_mask & (IB_QP_PKEY_INDEX || IB_QP_PORT)) && qp_pps) {
    ^
    1 warning generated.

    A bitwise OR should have been used instead.

    Fixes: 1dd017882e01 ("RDMA/core: Fix protection fault in get_pkey_idx_qp_list")
    Link: https://lore.kernel.org/r/20200217204318.13609-1-natechancellor@gmail.com
    Link: https://github.com/ClangBuiltLinux/linux/issues/889
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/core/security.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/infiniband/core/security.c b/drivers/infiniband/core/security.c
    index 839ee047f36be..f2c2e725375e4 100644
    --- a/drivers/infiniband/core/security.c
    +++ b/drivers/infiniband/core/security.c
    @@ -349,7 +349,7 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp,
    if ((qp_attr_mask & IB_QP_PKEY_INDEX) && (qp_attr_mask & IB_QP_PORT))
    new_pps->main.state = IB_PORT_PKEY_VALID;

    - if (!(qp_attr_mask & (IB_QP_PKEY_INDEX || IB_QP_PORT)) && qp_pps) {
    + if (!(qp_attr_mask & (IB_QP_PKEY_INDEX | IB_QP_PORT)) && qp_pps) {
    new_pps->main.port_num = qp_pps->main.port_num;
    new_pps->main.pkey_index = qp_pps->main.pkey_index;
    if (qp_pps->main.state != IB_PORT_PKEY_NOT_VALID)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-03-10 14:12    [W:4.147 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site