From patchwork Mon Feb 18 16:04:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy King X-Patchwork-Id: 221414 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 35AA92C0090 for ; Tue, 19 Feb 2013 03:09:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754824Ab3BRQIK (ORCPT ); Mon, 18 Feb 2013 11:08:10 -0500 Received: from smtp-outbound-1.vmware.com ([208.91.2.12]:33411 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652Ab3BRQII (ORCPT ); Mon, 18 Feb 2013 11:08:08 -0500 Received: from sc9-mailhost2.vmware.com (sc9-mailhost2.vmware.com [10.113.161.72]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 5C7BD28C62; Mon, 18 Feb 2013 08:08:06 -0800 (PST) Received: from vmware.com (promb-2s-dhcp87.eng.vmware.com [10.20.92.87]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 46D65B085D; Mon, 18 Feb 2013 08:08:06 -0800 (PST) From: Andy King To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Cc: davem@davemloft.net, pv-drivers@vmware.com, kraxel@redhat.com, Andy King Subject: [PATCH 4/4] VSOCK: Don't reject PF_VSOCK protocol Date: Mon, 18 Feb 2013 08:04:13 -0800 Message-Id: <1361203453-1347-5-git-send-email-acking@vmware.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1361203453-1347-1-git-send-email-acking@vmware.com> References: <1361203453-1347-1-git-send-email-acking@vmware.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allow our own family as the protocol value for socket creation. Reported-by: Gerd Hoffmann Signed-off-by: Andy King --- net/vmw_vsock/af_vsock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index c1b9e55..ca511c4 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1860,7 +1860,7 @@ static int vsock_create(struct net *net, struct socket *sock, if (!sock) return -EINVAL; - if (protocol) + if (protocol && protocol != PF_VSOCK) return -EPROTONOSUPPORT; switch (sock->type) {