From patchwork Wed Dec 18 16:11:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 1212550 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="QPU2CEKd"; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dKl63vvvz9sS9 for ; Thu, 19 Dec 2019 03:11:45 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D20CB10113662; Wed, 18 Dec 2019 08:15:04 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=207.211.31.120; helo=us-smtp-1.mimecast.com; envelope-from=pabeni@redhat.com; receiver= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 905AC10113636 for ; Wed, 18 Dec 2019 08:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576685498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVX+IYD4cAqYIONlRuELnrxk3IHCaGXiTHJX8aUFL7o=; b=QPU2CEKdBjflItmk80aAGvdWjr/N2QtSyiD3pPDJi2Re7kZQx8VgUkVXAx39e0v1pyjpsG NHWriHrKQV7aOlX8KCztHY1IuzD+ksyGwJJ0SBTykJ/O9hqVA98EkyNV9p5MrINUW+azmw gEwjqhp6FMMGUwxaZF3QuaDquJBU9Ak= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-119-_LfVq7sQNTevXfVttq96Zg-1; Wed, 18 Dec 2019 11:11:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0926EDB62 for ; Wed, 18 Dec 2019 16:11:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-55.ams2.redhat.com [10.36.117.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 728D960303 for ; Wed, 18 Dec 2019 16:11:34 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.01.org Date: Wed, 18 Dec 2019 17:11:27 +0100 Message-Id: <3e4ffcf745e9f34ad46a21bff91f199c882ef740.1576685173.git.pabeni@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: _LfVq7sQNTevXfVttq96Zg-1 X-Mimecast-Spam-Score: 0 Message-ID-Hash: YGBSYXIUCDZAVSXOZKDZG3FYX7LAW7ET X-Message-ID-Hash: YGBSYXIUCDZAVSXOZKDZG3FYX7LAW7ET X-MailFrom: pabeni@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] Squash-to: "mptcp: Add MPTCP socket stubs" List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: whoops, bad bitmask in previous commit - we must enumerate the supported {recv,send}msg flags. Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index cbd6c1e0fb96..5e24e7cf7d70 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -22,7 +22,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) struct mptcp_sock *msk = mptcp_sk(sk); struct socket *subflow = msk->subflow; - if (msg->msg_flags & ~(MSG_MORE | MSG_NOSIGNAL)) + if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL)) return -EOPNOTSUPP; return sock_sendmsg(subflow, msg); @@ -34,7 +34,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, struct mptcp_sock *msk = mptcp_sk(sk); struct socket *subflow = msk->subflow; - if (msg->msg_flags & ~(MSG_MORE | MSG_PEEK)) + if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT)) return -EOPNOTSUPP; return sock_recvmsg(subflow, msg, flags);