From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbbJWMOd (ORCPT ); Fri, 23 Oct 2015 08:14:33 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:35595 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751721AbbJWML2 (ORCPT ); Fri, 23 Oct 2015 08:11:28 -0400 From: LABBE Corentin To: acme@ghostprotocols.net, davem@davemloft.net Cc: LABBE Corentin , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 02/11] net: llc: fix a setting of error value to size_t Date: Fri, 23 Oct 2015 14:10:27 +0200 Message-Id: <1445602236-24130-3-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1445602236-24130-1-git-send-email-clabbe.montjoie@gmail.com> References: <1445602236-24130-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The variable copied is a size_t, so setting a negative value to it is invalid. The patch add an "err" variable for getting the error code. Signed-off-by: LABBE Corentin --- net/llc/af_llc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 8dab4e5..79b915d 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -719,9 +719,10 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, unsigned long used; int target; /* Read at least this many bytes */ long timeo; + int err = 0; lock_sock(sk); - copied = -ENOTCONN; + err = -ENOTCONN; if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN)) goto out; @@ -745,9 +746,8 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, * and move it down to the bottom of the loop */ if (signal_pending(current)) { - if (copied) - break; - copied = timeo ? sock_intr_errno(timeo) : -EAGAIN; + if (!copied) + err = timeo ? sock_intr_errno(timeo) : -EAGAIN; break; } @@ -775,7 +775,7 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, break; if (sk->sk_err) { - copied = sock_error(sk); + err = sock_error(sk); break; } if (sk->sk_shutdown & RCV_SHUTDOWN) @@ -787,13 +787,15 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, * This occurs when user tries to read * from never connected socket. */ - copied = -ENOTCONN; + err = -ENOTCONN; + copied = 0; break; } break; } if (!timeo) { - copied = -EAGAIN; + err = -EAGAIN; + copied = 0; break; } } @@ -823,7 +825,7 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (rc) { /* Exception. Bailout! */ if (!copied) - copied = -EFAULT; + err = -EFAULT; break; } } @@ -850,6 +852,8 @@ static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, out: release_sock(sk); + if (err) + return err; return copied; copy_uaddr: if (uaddr != NULL && skb != NULL) { -- 2.4.10