diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-10-17 14:32:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-19 14:04:32 +0200 |
| commit | 9a03c3d398c17eadfc5bc470c1084beb71c088f1 (patch) | |
| tree | 2091433de0df2d70996ed29f4063a0ad52f1b61a | |
| parent | Merge branch 'ena-next' (diff) | |
| download | linux-9a03c3d398c17eadfc5bc470c1084beb71c088f1.tar.xz linux-9a03c3d398c17eadfc5bc470c1084beb71c088f1.zip | |
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: d1ff70241a27 ("thunderbolt: Add support for XDomain discovery protocol")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/thunderbolt/xdomain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c index 138027537d29..ff8d91189e99 100644 --- a/drivers/thunderbolt/xdomain.c +++ b/drivers/thunderbolt/xdomain.c @@ -56,7 +56,7 @@ static bool tb_xdomain_match(const struct tb_cfg_request *req, case TB_CFG_PKG_XDOMAIN_RESP: { const struct tb_xdp_header *res_hdr = pkg->buffer; 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) return false; @@ -476,7 +476,7 @@ static void tb_xdp_handle_request(struct work_struct *work) struct tb_ctl *ctl = tb->ctl; const uuid_t *uuid; int ret = 0; - u8 sequence; + u32 sequence; u64 route; route = ((u64)xhdr->route_hi << 32 | xhdr->route_lo) & ~BIT_ULL(63); |