Commit 9a03c3d3 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

thunderbolt: Fix a couple right shifting to zero bugs

The problematic code looks like this:

	res_seq = res_hdr->xd_hdr.length_sn & TB_XDOMAIN_SN_MASK;
	res_seq >>= TB_XDOMAIN_SN_SHIFT;

TB_XDOMAIN_SN_SHIFT is 27, and right shifting a u8 27 bits is always
going to result in zero.  The fix is to declare these variables as u32.

Fixes: d1ff7024 ("thunderbolt: Add support for XDomain discovery protocol")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a90cca7c
...@@ -56,7 +56,7 @@ static bool tb_xdomain_match(const struct tb_cfg_request *req, ...@@ -56,7 +56,7 @@ static bool tb_xdomain_match(const struct tb_cfg_request *req,
case TB_CFG_PKG_XDOMAIN_RESP: { case TB_CFG_PKG_XDOMAIN_RESP: {
const struct tb_xdp_header *res_hdr = pkg->buffer; const struct tb_xdp_header *res_hdr = pkg->buffer;
const struct tb_xdp_header *req_hdr = req->request; const struct tb_xdp_header *req_hdr = req->request;
u8 req_seq, res_seq; u32 req_seq, res_seq;
if (pkg->frame.size < req->response_size / 4) if (pkg->frame.size < req->response_size / 4)
return false; return false;
...@@ -476,7 +476,7 @@ static void tb_xdp_handle_request(struct work_struct *work) ...@@ -476,7 +476,7 @@ static void tb_xdp_handle_request(struct work_struct *work)
struct tb_ctl *ctl = tb->ctl; struct tb_ctl *ctl = tb->ctl;
const uuid_t *uuid; const uuid_t *uuid;
int ret = 0; int ret = 0;
u8 sequence; u32 sequence;
u64 route; u64 route;
route = ((u64)xhdr->route_hi << 32 | xhdr->route_lo) & ~BIT_ULL(63); route = ((u64)xhdr->route_hi << 32 | xhdr->route_lo) & ~BIT_ULL(63);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment