diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2010-01-04 02:02:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-07 00:24:55 -0800 |
| commit | 82ecbcb9c6b5257929968d5b0ed536772a9b4ac5 (patch) | |
| tree | c147c743bc284709f87ba677048757a3b4547357 /net/phonet/pep.c | |
| parent | fea93ecef619b5779ca6984568517b1685079b05 (diff) | |
| download | kernel_goldelico_gta04-82ecbcb9c6b5257929968d5b0ed536772a9b4ac5.zip kernel_goldelico_gta04-82ecbcb9c6b5257929968d5b0ed536772a9b4ac5.tar.gz kernel_goldelico_gta04-82ecbcb9c6b5257929968d5b0ed536772a9b4ac5.tar.bz2 | |
Phonet: reject unsupported sendmsg/recvmsg flags
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet/pep.c')
| -rw-r--r-- | net/phonet/pep.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 72db27e..360cf37 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -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, |