Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b18e7a06 authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25: Fix x25_create errors for bad protocol and ENOBUFS 



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

Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf588477

net/x25/af_x25.c

+9 −4
Original line number Diff line number Diff line
@@ -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;