Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8facd5fb authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller
Browse files

net: fix smatch warnings inside datagram_poll 



Commit 7d4c04fc ("net: add option to enable
error queue packets waking select") has an issue due to operator precedence
causing the bit-wise OR to bind to the sock_flags call instead of the result of
the terniary conditional. This fixes the *_poll functions to work properly. The
old code results in "mask |= POLLPRI" instead of what was intended, which is to
only include POLLPRI when the socket option is enabled.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be0e2f1f

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock, 


	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))

		mask |= POLLERR |

			sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0;

			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);



	if (sk->sk_shutdown & RCV_SHUTDOWN)

		mask |= POLLRDHUP | POLLIN | POLLRDNORM;

net/core/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ unsigned int datagram_poll(struct file *file, struct socket *sock, 
	/* exceptional events? */

	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))

		mask |= POLLERR |

			sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0;

			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);



	if (sk->sk_shutdown & RCV_SHUTDOWN)

		mask |= POLLRDHUP | POLLIN | POLLRDNORM;

net/iucv/af_iucv.c

+1 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock, 


	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))

		mask |= POLLERR |

			sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0;

			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);



	if (sk->sk_shutdown & RCV_SHUTDOWN)

		mask |= POLLRDHUP;

net/nfc/llcp/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static unsigned int llcp_sock_poll(struct file *file, struct socket *sock, 


	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))

		mask |= POLLERR |

			sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0;

			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);



	if (!skb_queue_empty(&sk->sk_receive_queue))

		mask |= POLLIN | POLLRDNORM;

net/unix/af_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -2197,7 +2197,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, 
	/* exceptional events? */

	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))

		mask |= POLLERR |

			sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0;

			(sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);



	if (sk->sk_shutdown & RCV_SHUTDOWN)

		mask |= POLLRDHUP | POLLIN | POLLRDNORM;