From patchwork Sun Feb 14 12:00:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 45295 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 DDA87B7BFA for ; Sun, 14 Feb 2010 23:06:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758305Ab0BNMGG (ORCPT ); Sun, 14 Feb 2010 07:06:06 -0500 Received: from mail-px0-f184.google.com ([209.85.216.184]:40337 "EHLO mail-px0-f184.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751955Ab0BNMGE (ORCPT ); Sun, 14 Feb 2010 07:06:04 -0500 X-Greylist: delayed 345 seconds by postgrey-1.27 at vger.kernel.org; Sun, 14 Feb 2010 07:06:04 EST Received: by pxi14 with SMTP id 14so175187pxi.15 for ; Sun, 14 Feb 2010 04:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=1vDOw2NaQmFJauPW/2KQC43v01ct1d7YDdq81VezgFs=; b=Rk0A+44oDv993sJJwJNwRC3ASPh9aU4CNWKLL5mZaUsj0r9kiJZUafDtpii8gr4CCg fsyKfGcDlSCDjCy4Rzlh1wReQRahY8+QGVSj8K1mIjzYg9C0J3cxy1WYQj86Lu8BdN1x S7dW0BBGfyIJhDVrV2+Bw7yTi0yoeUT10eJy4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=n0ibcMi1f4Z5pjs8NMspjVfAv6eyTrLqadHivgxaD0qoqz6Uxz8loN7O+GR82I6OZf uKHiBIFWnfijAYjsP3Qk6qa70bLdmmfkPHoNyfdICnq+RZ0UpLx68kc5BIsgRAtnIqrj 9kEFyJ2W3RN/why2+FnSz6ntdexu5m4qSeXxM= Received: by 10.140.55.4 with SMTP id d4mr2564640rva.117.1266148816553; Sun, 14 Feb 2010 04:00:16 -0800 (PST) Received: from ?192.168.0.2? (124-168-50-123.dyn.iinet.net.au [124.168.50.123]) by mx.google.com with ESMTPS id 22sm3271972pzk.9.2010.02.14.04.00.14 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Feb 2010 04:00:15 -0800 (PST) Subject: [PATCH 1/2] X25: Fix x25_create errors for bad protocol and ENOBUFS From: Andrew Hendry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 14 Feb 2010 23:00:11 +1100 Message-ID: <1266148811.4731.43.camel@ibex> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org alloc_socket failures should return -ENOBUFS a bad protocol should return -EINVAL Signed-off-by: Andrew Hendry 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;