From patchwork Wed Mar 23 14:43:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 64237 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp74664lbc; Wed, 23 Mar 2016 07:46:48 -0700 (PDT) X-Received: by 10.66.176.139 with SMTP id ci11mr4827422pac.68.1458744408231; Wed, 23 Mar 2016 07:46:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s69si4808318pfi.105.2016.03.23.07.46.47; Wed, 23 Mar 2016 07:46:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932269AbcCWOp5 (ORCPT + 29 others); Wed, 23 Mar 2016 10:45:57 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36149 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755409AbcCWOpw (ORCPT ); Wed, 23 Mar 2016 10:45:52 -0400 Received: by mail-wm0-f42.google.com with SMTP id r129so139808864wmr.1 for ; Wed, 23 Mar 2016 07:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HDuydYBIGrpzItfay7/N0dzuI8g4VSr8Ze/55tEvn+U=; b=i1ic5eGxafNAqC46woJq9tj/tkOweQKTG8k1gZtj8M2qKhZWxNjhLHDdsUBpLUrSih II5RfxpSG8rdGRZIgntw0tJHAOuK2Rn2S6igNOy5l2z0tqBQRTI4NtkVYpdEaXnN5T6M X8RXF6QwFYNLL6gX8tOFTIyqP9pP6JB/hmrbQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HDuydYBIGrpzItfay7/N0dzuI8g4VSr8Ze/55tEvn+U=; b=EhVpbCkvaClaQuw1VgGXjBLQu41ryquo02B6crFp7IzGmB8d+PpYWkkw80YD+1KUmV hW+J9aUb6KpZnsLqztuyv5D30JwZCal0s0ISqRbWuwVcgpcooqRogljs+WivyEl1D1Au o8trJoZuh8772TisGa8dLzaSxfqC6j7vMlsIUB+SURURr812fPCRsOZfmnIEugEyZO00 bPsuyh1xRb1/jm0p5xSG7aKhRBjnR1Qgj4+Fg7yHEWHZrcRKKX1peshFocitgYhd7w3d jXEUldIwzPxfqLQ8GTZhU98+TU6+g/lEDJGqncOaNYhq52YLCB7mnIGuZQ6WOIzTh4OI KHvA== X-Gm-Message-State: AD7BkJJ3U+hYyEk4Lj7L9TEKIl6z5Puh8T0bTEviYOze2rf7jMPorDrvzsCAR5heI41L8im3 X-Received: by 10.194.92.107 with SMTP id cl11mr4374026wjb.21.1458744351356; Wed, 23 Mar 2016 07:45:51 -0700 (PDT) Received: from localhost.localdomain (host81-129-172-93.range81-129.btcentralplus.com. [81.129.172.93]) by smtp.gmail.com with ESMTPSA id 192sm3339980wmw.0.2016.03.23.07.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 07:45:50 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, jassisinghbrar@gmail.com, dan.carpenter@oracle.com, Lee Jones Subject: [PATCH v2 3/5] mailbox: mailbox-test: Use more consistent format for calling copy_from_user() Date: Wed, 23 Mar 2016 14:43:41 +0000 Message-Id: <1458744223-12164-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458744223-12164-1-git-send-email-lee.jones@linaro.org> References: <1458744223-12164-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While we're at it, ensure copy-to location is NULL'ed in the error path. Suggested-by: Dan Carpenter Signed-off-by: Lee Jones --- drivers/mailbox/mailbox-test.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index dc11bbf..5f4b439 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c @@ -46,7 +46,6 @@ static ssize_t mbox_test_signal_write(struct file *filp, size_t count, loff_t *ppos) { struct mbox_test_device *tdev = filp->private_data; - int ret; if (!tdev->tx_channel) { dev_err(tdev->dev, "Channel cannot do Tx\n"); @@ -64,13 +63,13 @@ static ssize_t mbox_test_signal_write(struct file *filp, if (!tdev->signal) return -ENOMEM; - ret = copy_from_user(tdev->signal, userbuf, count); - if (ret) { + if (copy_from_user(tdev->signal, userbuf, count)) { kfree(tdev->signal); + tdev->signal = NULL; return -EFAULT; } - return ret < 0 ? ret : count; + return count; } static const struct file_operations mbox_test_signal_ops = {