diff options
| author | Loic Poulain <loic.poulain@linaro.org> | 2021-04-22 11:21:51 +0200 |
|---|---|---|
| committer | Loic Poulain <loic.poulain@linaro.org> | 2021-04-22 14:38:29 +0200 |
| commit | 04b254ab1122ae3e646f95ecf1399e4b00f14fd3 (patch) | |
| tree | b31553667f549dfc757e8be01d09a7ea5b8fc0f6 | |
| parent | 9c07941e85e7759389578b7c34266351a6031bd2 (diff) | |
net: wwan: core: Return poll error in case of port removaltelit-5.12
Ensure that the poll system call returns error flags when port is
removed, allowing user side to properly fail, without trying read
or write. Port removal leads to nullified port operations, add a
is_port_connected() helper to safely check the status.
Fixes: 9a44c1cc6388 ("net: Add a WWAN subsystem")
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
| -rw-r--r-- | drivers/net/wwan/wwan_core.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c index 5be5e1e3534c..c965b213b67f 100644 --- a/drivers/net/wwan/wwan_core.c +++ b/drivers/net/wwan/wwan_core.c @@ -369,14 +369,25 @@ out_unlock: return ret; } +static bool is_port_connected(struct wwan_port *port) +{ + bool connected; + + mutex_lock(&port->ops_lock); + connected = !!port->ops; + mutex_unlock(&port->ops_lock); + + return connected; +} + static bool is_read_blocked(struct wwan_port *port) { - return skb_queue_empty(&port->rxq) && port->ops; + return skb_queue_empty(&port->rxq) && is_port_connected(port); } static bool is_write_blocked(struct wwan_port *port) { - return test_bit(WWAN_PORT_TX_OFF, &port->flags) && port->ops; + return test_bit(WWAN_PORT_TX_OFF, &port->flags) && is_port_connected(port); } static int wwan_wait_rx(struct wwan_port *port, bool nonblock) @@ -508,6 +519,8 @@ static __poll_t wwan_port_fops_poll(struct file *filp, poll_table *wait) mask |= EPOLLOUT | EPOLLWRNORM; if (!is_read_blocked(port)) mask |= EPOLLIN | EPOLLRDNORM; + if (!is_port_connected(port)) + mask |= EPOLLHUP | EPOLLERR; return mask; } |