diff options
author | Joe Perches <joe@perches.com> | 2014-10-27 01:25:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-03 09:40:10 -0500 |
commit | f491dbe049cc7d8fb4c1cdc7d9fdfac0d1d99869 (patch) | |
tree | b1d6bded805070e95ed833bb63270e9edbc212d9 | |
parent | e5f3d00c243177f4d7a0e86d17b7eaefd4a0c908 (diff) |
[media] dvb-net: Fix probable mask then right shift defects
Precedence of & and >> is not the same and is not left to right.
shift has higher precedence and should be done after the mask.
Add parentheses around the mask.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/dvb-core/dvb_net.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c index 059e6117f22b..441814b94eb8 100644 --- a/drivers/media/dvb-core/dvb_net.c +++ b/drivers/media/dvb-core/dvb_net.c | |||
@@ -379,7 +379,9 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) | |||
379 | /* Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control . */ | 379 | /* Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control . */ |
380 | if ((ts[0] != TS_SYNC) || (ts[1] & TS_TEI) || ((ts[3] & TS_SC) != 0)) { | 380 | if ((ts[0] != TS_SYNC) || (ts[1] & TS_TEI) || ((ts[3] & TS_SC) != 0)) { |
381 | printk(KERN_WARNING "%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n", | 381 | printk(KERN_WARNING "%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n", |
382 | priv->ts_count, ts[0], ts[1] & TS_TEI >> 7, ts[3] & 0xC0 >> 6); | 382 | priv->ts_count, ts[0], |
383 | (ts[1] & TS_TEI) >> 7, | ||
384 | (ts[3] & 0xC0) >> 6); | ||
383 | 385 | ||
384 | /* Drop partly decoded SNDU, reset state, resync on PUSI. */ | 386 | /* Drop partly decoded SNDU, reset state, resync on PUSI. */ |
385 | if (priv->ule_skb) { | 387 | if (priv->ule_skb) { |