From patchwork Fri Jun 1 13:21:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10443443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1792D603D7 for ; Fri, 1 Jun 2018 13:22:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 095E428D95 for ; Fri, 1 Jun 2018 13:22:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F22B728D9A; Fri, 1 Jun 2018 13:22:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9753C28D95 for ; Fri, 1 Jun 2018 13:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbeFANWI (ORCPT ); Fri, 1 Jun 2018 09:22:08 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55242 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751502AbeFANWG (ORCPT ); Fri, 1 Jun 2018 09:22:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A50E8BB41B; Fri, 1 Jun 2018 13:22:04 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-106.ams2.redhat.com [10.36.117.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C4A52023421; Fri, 1 Jun 2018 13:22:03 +0000 (UTC) From: Hans de Goede To: Greg Kroah-Hartman , Samuel Ortiz Cc: Hans de Goede , linux-usb@vger.kernel.org, =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Michael Thalmeier , linux-wireless@vger.kernel.org Subject: [PATCH resend 1/2] NFC: pn533: Use kmalloc-ed memory for USB transfer buffers Date: Fri, 1 Jun 2018 15:21:59 +0200 Message-Id: <20180601132200.25973-2-hdegoede@redhat.com> In-Reply-To: <20180601132200.25973-1-hdegoede@redhat.com> References: <20180601132200.25973-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 01 Jun 2018 13:22:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 01 Jun 2018 13:22:04 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'hdegoede@redhat.com' RCPT:'' Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 8b55d7581fc5 ("NFC: pn533: use constant off-stack buffer for sending acks"), fixed the ack case of using on stack mem for the transfer_buffer, by making the ack buffer "static const", which is an unusual solution for this and I wonder if this is not a problem wrt buffer alignment. It also misses fixing the same problem for the cmd buffer in the pn533_acr122_poweron_rdr() function. This commit introduces an out_buf which gets kmalloc-ed on probe and then memcpy-s the ack / cmd buffer into that buffer before submitting the out urb. Fixing the use of on stack memory for the cmd buffer and moving the ack code-path over to more conventional ways. While at it this commit also changes the kmalloc of the in_buf to devm_kmalloc, to avoid the need to introduce a new goto in the error- handling of the kmalloc of the introduced out_buf. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514134 Fixes: 8b55d7581fc5 ("NFC: pn533: use constant off-stack buffer ...") Cc: Michał Mirosław Signed-off-by: Hans de Goede --- drivers/nfc/pn533/usb.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index e153e8b64bb8..c9398712ba31 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -42,6 +42,9 @@ #define ACS_VENDOR_ID 0x072f #define ACR122U_PRODUCT_ID 0x2200 +/* Large enough to hold an ack or the power-on CCID command */ +#define OUT_BUF_LEN 16 + static const struct usb_device_id pn533_usb_table[] = { { USB_DEVICE(PN533_VENDOR_ID, PN533_PRODUCT_ID), .driver_info = PN533_DEVICE_STD }, @@ -61,6 +64,7 @@ struct pn533_usb_phy { struct urb *out_urb; struct urb *in_urb; + u8 *out_buf; struct pn533 *priv; }; @@ -152,7 +156,8 @@ static int pn533_usb_send_ack(struct pn533 *dev, gfp_t flags) /* spec 7.1.1.3: Preamble, SoPC (2), ACK Code (2), Postamble */ int rc; - phy->out_urb->transfer_buffer = (u8 *)ack; + memcpy(phy->out_buf, ack, sizeof(ack)); + phy->out_urb->transfer_buffer = phy->out_buf; phy->out_urb->transfer_buffer_length = sizeof(ack); rc = usb_submit_urb(phy->out_urb, flags); @@ -373,8 +378,8 @@ static void pn533_acr122_poweron_rdr_resp(struct urb *urb) static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) { /* Power on th reader (CCID cmd) */ - u8 cmd[10] = {PN533_ACR122_PC_TO_RDR_ICCPOWERON, - 0, 0, 0, 0, 0, 0, 3, 0, 0}; + static const u8 cmd[10] = { PN533_ACR122_PC_TO_RDR_ICCPOWERON, + 0, 0, 0, 0, 0, 0, 3, 0, 0 }; int rc; void *cntx; struct pn533_acr122_poweron_rdr_arg arg; @@ -387,7 +392,8 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) phy->in_urb->complete = pn533_acr122_poweron_rdr_resp; phy->in_urb->context = &arg; - phy->out_urb->transfer_buffer = cmd; + memcpy(phy->out_buf, cmd, sizeof(cmd)); + phy->out_urb->transfer_buffer = phy->out_buf; phy->out_urb->transfer_buffer_length = sizeof(cmd); print_hex_dump_debug("ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1, @@ -463,10 +469,14 @@ static int pn533_usb_probe(struct usb_interface *interface, if (!phy) return -ENOMEM; - in_buf = kzalloc(in_buf_len, GFP_KERNEL); + in_buf = devm_kzalloc(&interface->dev, in_buf_len, GFP_KERNEL); if (!in_buf) return -ENOMEM; + phy->out_buf = devm_kzalloc(&interface->dev, OUT_BUF_LEN, GFP_KERNEL); + if (!phy->out_buf) + return -ENOMEM; + phy->udev = usb_get_dev(interface_to_usbdev(interface)); phy->interface = interface; @@ -555,7 +565,6 @@ static int pn533_usb_probe(struct usb_interface *interface, usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); usb_put_dev(phy->udev); - kfree(in_buf); return rc; } @@ -574,7 +583,6 @@ static void pn533_usb_disconnect(struct usb_interface *interface) usb_kill_urb(phy->in_urb); usb_kill_urb(phy->out_urb); - kfree(phy->in_urb->transfer_buffer); usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb);