diff options
| author | David Windsor <dave@nullcore.net> | 2017-06-10 22:50:43 -0400 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2018-01-15 12:08:01 -0800 |
| commit | b2ce04c2a336c39539b51955fd15fe27ebc96080 (patch) | |
| tree | 095cb825ffa8e3c8daab657bf3e483e92d37408a /net/sctp | |
| parent | ab9ee8e38b292f9a6698a4fedbb6ff8d08ce2012 (diff) | |
| download | blackbird-op-linux-b2ce04c2a336c39539b51955fd15fe27ebc96080.tar.gz blackbird-op-linux-b2ce04c2a336c39539b51955fd15fe27ebc96080.zip | |
sctp: Copy struct sctp_sock.autoclose to userspace using put_user()
The autoclose field can be copied with put_user(), so there is no need to
use copy_to_user(). In both cases, hardened usercopy is being bypassed
since the size is constant, and not open to runtime manipulation.
This patch is verbatim from Brad Spengler/PaX Team's PAX_USERCOPY
whitelisting code in the last public patch of grsecurity/PaX based on my
understanding of the code. Changes or omissions from the original code are
mine and don't reflect the original grsecurity/PaX code.
Signed-off-by: David Windsor <dave@nullcore.net>
[kees: adjust commit log]
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-sctp@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index efbc8f52c531..15491491ec88 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -5011,7 +5011,7 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv len = sizeof(int); if (put_user(len, optlen)) return -EFAULT; - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int))) + if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval)) return -EFAULT; return 0; } |
