From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C00F4CA9EB9 for ; Sat, 26 Oct 2019 13:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9649C222C2 for ; Sat, 26 Oct 2019 13:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096288; bh=YHZCMHMZ8f4+ss/9ljgSUznzGB3ZmURlqG0t/WHSxXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZTsbLOJhh9fH7AdqG1530t4hIjru9xCs4K2EjIyF9QocqdDrA8XcG1pDkKaHFl7ky uWv0GxzA6iFNNxvnyqiOIrRRGhuLCxPvmsSkT+L496GJGS7T9cCCcyWUtvDzv8bIgn 6bfl2zFAdOb0c8pOwtzjlWZ4kfGoTdniNpKScvIQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727818AbfJZNYn (ORCPT ); Sat, 26 Oct 2019 09:24:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:44736 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729514AbfJZNW5 (ORCPT ); Sat, 26 Oct 2019 09:22:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F23022070B; Sat, 26 Oct 2019 13:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096176; bh=YHZCMHMZ8f4+ss/9ljgSUznzGB3ZmURlqG0t/WHSxXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FjUyv0dSL/TkQeS3Jb0EMd+RxIMh0OfW2KPXsLsYgJOtzJ6oC2WQ5pN/erAPh/3yk 0CK6Dx90S7YkPmeQ88BxWSaeY8Wma3pOR1G8vFHSnyvo13N7HnFjL3IospBbyVmKEn dPOJOuF4yY3RLEahAyhnO/j2/0oVwOTLIxL/gWeA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 19/21] usb: hso: obey DMA rules in tiocmget Date: Sat, 26 Oct 2019 09:22:15 -0400 Message-Id: <20191026132217.4380-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026132217.4380-1-sashal@kernel.org> References: <20191026132217.4380-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Oliver Neukum [ Upstream commit af0de1303c4e8f44fadd7b4c593f09f22324b04f ] The serial state information must not be embedded into another data structure, as this interferes with cache handling for DMA on architectures without cache coherence.. That would result in data corruption on some architectures Allocating it separately. v2: fix syntax error Signed-off-by: Oliver Neukum Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/hso.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 27fc699d8be5b..e5d6a70c44db7 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -201,7 +201,7 @@ struct hso_tiocmget { int intr_completed; struct usb_endpoint_descriptor *endp; struct urb *urb; - struct hso_serial_state_notification serial_state_notification; + struct hso_serial_state_notification *serial_state_notification; u16 prev_UART_state_bitmap; struct uart_icount icount; }; @@ -1447,7 +1447,7 @@ static int tiocmget_submit_urb(struct hso_serial *serial, usb_rcvintpipe(usb, tiocmget->endp-> bEndpointAddress & 0x7F), - &tiocmget->serial_state_notification, + tiocmget->serial_state_notification, sizeof(struct hso_serial_state_notification), tiocmget_intr_callback, serial, tiocmget->endp->bInterval); @@ -1494,7 +1494,7 @@ static void tiocmget_intr_callback(struct urb *urb) /* wIndex should be the USB interface number of the port to which the * notification applies, which should always be the Modem port. */ - serial_state_notification = &tiocmget->serial_state_notification; + serial_state_notification = tiocmget->serial_state_notification; if (serial_state_notification->bmRequestType != BM_REQUEST_TYPE || serial_state_notification->bNotification != B_NOTIFICATION || le16_to_cpu(serial_state_notification->wValue) != W_VALUE || @@ -2580,6 +2580,8 @@ static void hso_free_tiomget(struct hso_serial *serial) usb_free_urb(tiocmget->urb); tiocmget->urb = NULL; serial->tiocmget = NULL; + kfree(tiocmget->serial_state_notification); + tiocmget->serial_state_notification = NULL; kfree(tiocmget); } } @@ -2630,10 +2632,13 @@ static struct hso_device *hso_create_bulk_serial_device( num_urbs = 2; serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget), GFP_KERNEL); + serial->tiocmget->serial_state_notification + = kzalloc(sizeof(struct hso_serial_state_notification), + GFP_KERNEL); /* it isn't going to break our heart if serial->tiocmget * allocation fails don't bother checking this. */ - if (serial->tiocmget) { + if (serial->tiocmget && serial->tiocmget->serial_state_notification) { tiocmget = serial->tiocmget; tiocmget->endp = hso_get_ep(interface, USB_ENDPOINT_XFER_INT, -- 2.20.1