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

Commit 9ba0b963 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: use GFP_USER for user-controlled kmalloc 



Commit cacc0621 ("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: cacc0621 ("sctp: use GFP_USER for user-controlled kmalloc")
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3358a5c0

net/sctp/socket.c

+6 −3
Original line number Diff line number Diff line
@@ -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;