From patchwork Sat Feb  6 23:16:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: andrew hendry <andrew.hendry@gmail.com>
X-Patchwork-Id: 44733
X-Patchwork-Delegate: davem@davemloft.net
Return-Path: <netdev-owner@vger.kernel.org>
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 E8EEEB7D14
	for <patchwork-incoming@ozlabs.org>;
	Sun,  7 Feb 2010 10:17:54 +1100 (EST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933086Ab0BFXRB (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);
	Sat, 6 Feb 2010 18:17:01 -0500
Received: from mail-iw0-f189.google.com ([209.85.223.189]:61894 "EHLO
	mail-iw0-f189.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756370Ab0BFXRA (ORCPT
	<rfc822;netdev@vger.kernel.org>); Sat, 6 Feb 2010 18:17:00 -0500
Received: by iwn27 with SMTP id 27so807891iwn.5
	for <multiple recipients>; Sat, 06 Feb 2010 15:16:59 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:date:message-id:subject
	:from:to:content-type;
	bh=nNVD4vcQu+xoQyNbF4b/ka95JgT0HTAmDLna6tYuRtk=;
	b=xzblJ75zloUNguz6kaJGtel+BzffxdWeZe4Ia9uS41+EqvURIyKCH0hkqDtVeytSn1
	7vPTmQ9Mqw8TzMsctUTaPMkC53vBefEVpP6C2p1b8ypTEZAEuIysNZs4ugVgJa7BMwdy
	s0Lh23W5fl9j9EokeuGnM51y7wDJuznQgdFKI=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	b=AKgnXQYbXsRx9yvjU/KVRHQpXeSaIPUCVxYdcWuC3AMFuNIDZwfOMjHgvu57a/4cN5
	h3uA+Zdpg+fO1YH8TQWo6t0/JfyrkP3mOSLk/yKhwoaPJ3XPZhJnQOkBghJbFuxHZwT9
	3zMAOTcREk9wgadaRrYxKZbuWxhOM8O78OnNA=
MIME-Version: 1.0
Received: by 10.231.154.207 with SMTP id p15mr1626099ibw.71.1265498219499;
	Sat, 06 Feb 2010 15:16:59 -0800 (PST)
Date: Sun, 7 Feb 2010 10:16:59 +1100
Message-ID: <d45a3acc1002061516s3b3eab26tc2a9339613684e6f@mail.gmail.com>
Subject: [PATCH 1/2] X25: Fix x25_create errors for bad protocol and ENOBUFS
From: andrew hendry <andrew.hendry@gmail.com>
To: netdev@vger.kernel.org, linux-kernel <linux-kernel@vger.kernel.org>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

alloc_socket failures should return -ENOBUFS
a bad protocol should return -EINVAL

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e3219e4..6c7104e 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -512,15 +512,20 @@ static int x25_create(struct net *net, struct
socket *sock, int protocol,
 {
 	struct sock *sk;
 	struct x25_sock *x25;
-	int rc = -ESOCKTNOSUPPORT;
+	int rc = -EAFNOSUPPORT;

 	if (!net_eq(net, &init_net))
-		return -EAFNOSUPPORT;
+		goto out;
+
+	rc = -ESOCKTNOSUPPORT;
+	if (sock->type != SOCK_SEQPACKET)
+		goto out;

-	if (sock->type != SOCK_SEQPACKET || protocol)
+	rc = -EINVAL;
+	if (protocol)
 		goto out;

-	rc = -ENOMEM;
+	rc = -ENOBUFS;
 	if ((sk = x25_alloc_socket(net)) == NULL)
 		goto out;