| Message ID | 20190412104017.25507-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1db86318c4d1a0d1c8a19535290f71a03a2f13ad |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | [next] RDMA/mlx5: check for error return in flow_rule rather than err | expand |
On Fri, Apr 12, 2019 at 11:40:17AM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently when the call to create_flow_rule_vport_sq fails, the error > check is being performed on err rather than on the return pointer > flow_rule. The return flow_rule maybe NULL (which is not considered > an error) or an error code, so check for the error on flow_rule. > > Addresses-Coverity: ("Uninitialized scalar variable") > Fixes: d5ed8ac34cef ("RDMA/mlx5: Move default representors SQ steering to rule to modify QP") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/infiniband/hw/mlx5/qp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Thanks, Acked-by: Leon Romanovsky <leonro@mellanox.com>
On Fri, Apr 12, 2019 at 11:40:17AM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently when the call to create_flow_rule_vport_sq fails, the error > check is being performed on err rather than on the return pointer > flow_rule. The return flow_rule maybe NULL (which is not considered > an error) or an error code, so check for the error on flow_rule. > > Addresses-Coverity: ("Uninitialized scalar variable") > Fixes: d5ed8ac34cef ("RDMA/mlx5: Move default representors SQ steering to rule to modify QP") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/infiniband/hw/mlx5/qp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to for-next, thanks Jason
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 99ed77e7d7af..98c3241547fd 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -3276,7 +3276,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, flow_rule = create_flow_rule_vport_sq(dev, sq, raw_qp_param->port); if (IS_ERR(flow_rule)) - return err; + return PTR_ERR(flow_rule); err = modify_raw_packet_qp_sq(dev->mdev, sq, sq_state, raw_qp_param, qp->ibqp.pd);