diff options
| author | Jacob Keller <jacob.e.keller@intel.com> | 2013-04-02 13:55:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-02 16:59:16 -0400 |
| commit | 8facd5fb73c6e960555e5913743dfbb6c3d984a5 (patch) | |
| tree | 2d15a5e9bcf859b437171d17aa8996048bfee634 /net/unix/af_unix.c | |
| parent | be0e2f1f7d2fb6c49ea29a4f8274b36537c34dba (diff) | |
| download | op-kernel-dev-8facd5fb73c6e960555e5913743dfbb6c3d984a5.zip op-kernel-dev-8facd5fb73c6e960555e5913743dfbb6c3d984a5.tar.gz | |
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>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index fb7a63f..2e4d900 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -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; |
