| From foo@baz Wed Sep 26 11:27:32 CEST 2018 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Fri, 14 Sep 2018 17:39:53 +0100 |
| Subject: net: hp100: fix always-true check for link up state |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit a7f38002fb69b44f8fc622ecb838665d0b8666af ] |
| |
| The operation ~(p100_inb(VG_LAN_CFG_1) & HP100_LINK_UP) returns a value |
| that is always non-zero and hence the wait for the link to drop always |
| terminates prematurely. Fix this by using a logical not operator instead |
| of a bitwise complement. This issue has been in the driver since |
| pre-2.6.12-rc2. |
| |
| Detected by CoverityScan, CID#114157 ("Logical vs. bitwise operator") |
| |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/hp/hp100.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/hp/hp100.c |
| +++ b/drivers/net/ethernet/hp/hp100.c |
| @@ -2634,7 +2634,7 @@ static int hp100_login_to_vg_hub(struct |
| /* Wait for link to drop */ |
| time = jiffies + (HZ / 10); |
| do { |
| - if (~(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST)) |
| + if (!(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST)) |
| break; |
| if (!in_interrupt()) |
| schedule_timeout_interruptible(1); |
