Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

net: fix smatch warnings inside datagram_poll

Commit 7d4c04fc170087119727119074e72445f2bb192b ("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: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jacob Keller 12 years ago
parent
be0e2f1f7d
commit
8facd5fb73
5 changed files with 5 additions and 5 deletions
Split View Show Diff Stats
  1. 1 1
      net/bluetooth/af_bluetooth.c
  2. 1 1
      net/core/datagram.c
  3. 1 1
      net/iucv/af_iucv.c
  4. 1 1
      net/nfc/llcp/sock.c
  5. 1 1
      net/unix/af_unix.c

+ 1 - 1
net/bluetooth/af_bluetooth.c
View File 

@@ -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;

+ 1 - 1
net/core/datagram.c
View File 

@@ -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;

+ 1 - 1
net/iucv/af_iucv.c
View File 

@@ -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;

+ 1 - 1
net/nfc/llcp/sock.c
View File 

@@ -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;

+ 1 - 1
net/unix/af_unix.c
View File 

@@ -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;