From patchwork Thu Jun 3 11:33:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 196 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id 9FF4E154169 for ; Thu, 3 Jun 2010 13:34:03 +0200 (CEST) Received: (qmail invoked by alias); 03 Jun 2010 11:34:02 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.223.58] by mail.gmx.net (mp068) with SMTP; 03 Jun 2010 13:34:02 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/0S8gokQz005ToMxVRlKS0de4cX5fFgWH99xNszA GMz6EEcA0An2ua From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Thu, 3 Jun 2010 13:33:27 +0200 Message-Id: <1275564807-8725-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20100603100437.GS5483@bicker> References: <20100603100437.GS5483@bicker> X-Y-GMX-Trusted: 0 Cc: Dan Carpenter Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: return -EFAULT on copy_to_user errors X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 11:34:03 -0000 From: Dan Carpenter copy_to_user() returns the number of bites remaining but we want to return a negative error code here. Signed-off-by: Dan Carpenter [sven.eckelmann@gmx.de: Move change from device.c to icmp_socket.c] Signed-off-by: Sven Eckelmann --- This patch is already applied in maint and must be applied in master. batman-adv-kernelland/icmp_socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/icmp_socket.c b/batman-adv-kernelland/icmp_socket.c index bad87fd..08cca22 100644 --- a/batman-adv-kernelland/icmp_socket.c +++ b/batman-adv-kernelland/icmp_socket.c @@ -148,7 +148,7 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf, kfree(socket_packet); if (error) - return error; + return -EFAULT; return packet_len; }