diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-12-23 16:28:40 -0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-28 00:18:47 -0500 |
| commit | 9ba0b9636dc07a328ad3bffe9b22edb4cbb2901b (patch) | |
| tree | 1ad14a8a711525b3745be6a464e78e3b8652ea78 /net/sctp | |
| parent | 3358a5c0c1578fa215f90a0e750579cd6258ddd9 (diff) | |
| download | linux-9ba0b9636dc07a328ad3bffe9b22edb4cbb2901b.tar.gz linux-9ba0b9636dc07a328ad3bffe9b22edb4cbb2901b.tar.bz2 linux-9ba0b9636dc07a328ad3bffe9b22edb4cbb2901b.zip | |
sctp: use GFP_USER for user-controlled kmalloc
Commit cacc06215271 ("sctp: use GFP_USER for user-controlled kmalloc")
missed two other spots.
For connectx, as it's more likely to be used by kernel users of the API,
it detects if GFP_USER should be used or not.
Fixes: cacc06215271 ("sctp: use GFP_USER for user-controlled kmalloc")
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/socket.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9b6cc6de80d8..570f96ad4527 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1301,8 +1301,9 @@ static int __sctp_setsockopt_connectx(struct sock *sk, int addrs_size, sctp_assoc_t *assoc_id) { - int err = 0; struct sockaddr *kaddrs; + gfp_t gfp = GFP_KERNEL; + int err = 0; pr_debug("%s: sk:%p addrs:%p addrs_size:%d\n", __func__, sk, addrs, addrs_size); @@ -1315,7 +1316,9 @@ static int __sctp_setsockopt_connectx(struct sock *sk, return -EFAULT; /* Alloc space for the address array in kernel memory. */ - kaddrs = kmalloc(addrs_size, GFP_KERNEL); + if (sk->sk_socket->file) + gfp = GFP_USER | __GFP_NOWARN; + kaddrs = kmalloc(addrs_size, gfp); if (unlikely(!kaddrs)) return -ENOMEM; @@ -5773,7 +5776,7 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len, len = sizeof(struct sctp_assoc_ids) + sizeof(sctp_assoc_t) * num; - ids = kmalloc(len, GFP_KERNEL); + ids = kmalloc(len, GFP_USER | __GFP_NOWARN); if (unlikely(!ids)) return -ENOMEM; |