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

Commit 82ecbcb9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

Phonet: reject unsupported sendmsg/recvmsg flags 



Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fea93ece

net/phonet/datagram.c

+4 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static int pn_sendmsg(struct kiocb *iocb, struct sock *sk, 
	struct sk_buff *skb;

	int err;



	if (msg->msg_flags & MSG_OOB)

	if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_NOSIGNAL|

				MSG_CMSG_COMPAT))

		return -EOPNOTSUPP;



	if (msg->msg_name == NULL)
@@ -119,7 +120,8 @@ static int pn_recvmsg(struct kiocb *iocb, struct sock *sk, 
	int rval = -EOPNOTSUPP;

	int copylen;



	if (flags & MSG_OOB)

	if (flags & ~(MSG_PEEK|MSG_TRUNC|MSG_DONTWAIT|MSG_NOSIGNAL|

			MSG_CMSG_COMPAT))

		goto out_nofree;



	if (addr_len)

net/phonet/pep.c

+9 −1
Original line number Diff line number Diff line
@@ -860,7 +860,9 @@ static int pep_sendmsg(struct kiocb *iocb, struct sock *sk, 
	int flags = msg->msg_flags;

	int err, done;



	if (msg->msg_flags & MSG_OOB || !(msg->msg_flags & MSG_EOR))

	if ((msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_NOSIGNAL|

				MSG_CMSG_COMPAT)) ||

			!(msg->msg_flags & MSG_EOR))

		return -EOPNOTSUPP;



	skb = sock_alloc_send_skb(sk, MAX_PNPIPE_HEADER + len,
@@ -981,6 +983,10 @@ static int pep_recvmsg(struct kiocb *iocb, struct sock *sk, 
	struct sk_buff *skb;

	int err;



	if (flags & ~(MSG_OOB|MSG_PEEK|MSG_TRUNC|MSG_DONTWAIT|MSG_WAITALL|

			MSG_NOSIGNAL|MSG_CMSG_COMPAT))

		return -EOPNOTSUPP;



	if (unlikely(1 << sk->sk_state & (TCPF_LISTEN | TCPF_CLOSE)))

		return -ENOTCONN;
@@ -988,6 +994,8 @@ static int pep_recvmsg(struct kiocb *iocb, struct sock *sk, 
		/* Dequeue and acknowledge control request */

		struct pep_sock *pn = pep_sk(sk);



		if (flags & MSG_PEEK)

			return -EOPNOTSUPP;

		skb = skb_dequeue(&pn->ctrlreq_queue);

		if (skb) {

			pep_ctrlreq_error(sk, skb, PN_PIPE_NO_ERROR,