提交 3a1f0a0e 编写于 作者: C Clemens Ladisch 提交者: Stefan Richter

firewire: core: fix retries calculation in iso manage_channel()

If there is a permanent error condition when communicating with the IRM,
after the sixth error, the retry variable will be decremented to -1.
If, in this case, the bits in channels_mask are not yet exhausted, the
next channel is retried 2^32 times.

To fix this, check that retry is never decremented beyond zero.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
上级 a2612cb1
...@@ -250,8 +250,10 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation, ...@@ -250,8 +250,10 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,
/* 1394-1995 IRM, fall through to retry. */ /* 1394-1995 IRM, fall through to retry. */
default: default:
if (retry--) if (retry) {
retry--;
i--; i--;
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册