Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b9874c authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

net: thunderx: Fix unintentional sign extension issue 



[ Upstream commit e701a25840360706fe4cf5de0015913ca19c274b ]

The shifting of the u8 integers rq->caching by 26 bits to
the left will be promoted to a 32 bit signed int and then
sign-extended to a u64. In the event that rq->caching is
greater than 0x1f then all then all the upper 32 bits of
the u64 end up as also being set because of the int
sign-extension. Fix this by casting the u8 values to a
u64 before the 26 bit left shift.

Addresses-Coverity: ("Unintended sign extension")
Fixes: 4863dea3 ("net: Adding support for Cavium ThunderX network controller")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 00c0923f

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, 
	mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG;

	mbx.rq.qs_num = qs->vnic_id;

	mbx.rq.rq_num = qidx;

	mbx.rq.cfg = (rq->caching << 26) | (rq->cq_qs << 19) |

	mbx.rq.cfg = ((u64)rq->caching << 26) | (rq->cq_qs << 19) |

			  (rq->cq_idx << 16) | (rq->cont_rbdr_qs << 9) |

			  (rq->cont_qs_rbdr_idx << 8) |

			  (rq->start_rbdr_qs << 1) | (rq->start_qs_rbdr_idx);