[PATCH net 0/1] af_iucv: fix AF_IUCV sendmsg() errno

[PATCH net 0/1] af_iucv: fix AF_IUCV sendmsg() errno

[Ursula Braun]

From: Ursula Braun <ursula.braun@de.ibm.com>

Hi Dave,

here is a small patch for net fixing a bug in s390 net/iucv/af_iucv.c

shortlog:

Eugene Crosser (1):
  af_iucv: fix AF_IUCV sendmsg() errno

Thanks,
       Ursula

[PATCH net 1/1] af_iucv: fix AF_IUCV sendmsg() errno

[Ursula Braun]

From: Eugene Crosser <Eugene.Crosser@ru.ibm.com>

When sending over AF_IUCV socket, errno was incorrectly set to
ENOMEM even when other values where appropriate, notably EAGAIN.
With this patch, error indicator returned by sock_alloc_send_skb()
is passed to the caller, rather than being overwritten with ENOMEM.

Signed-off-by: Eugene Crosser <Eugene.Crosser@ru.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
---
 net/iucv/af_iucv.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 2e9953b..53d9311 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1114,10 +1114,8 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 			noblock, &err);
 	else
 		skb = sock_alloc_send_skb(sk, len, noblock, &err);
-	if (!skb) {
-		err = -ENOMEM;
+	if (!skb)
 		goto out;
-	}
 	if (iucv->transport == AF_IUCV_TRANS_HIPER)
 		skb_reserve(skb, sizeof(struct af_iucv_trans_hdr) + ETH_HLEN);
 	if (memcpy_from_msg(skb_put(skb, len), msg, len)) {
-- 
2.1.4

Re: [PATCH net 1/1] af_iucv: fix AF_IUCV sendmsg() errno

[David Miller]

From: Ursula Braun <ubraun@linux.vnet.ibm.com>
Date: Mon, 30 Mar 2015 15:40:42 +0200

> From: Eugene Crosser <Eugene.Crosser@ru.ibm.com>
> 
> When sending over AF_IUCV socket, errno was incorrectly set to
> ENOMEM even when other values where appropriate, notably EAGAIN.
> With this patch, error indicator returned by sock_alloc_send_skb()
> is passed to the caller, rather than being overwritten with ENOMEM.
> 
> Signed-off-by: Eugene Crosser <Eugene.Crosser@ru.ibm.com>
> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>

Applied, thanks.