stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masakazu Mokuno <masakazu.mokuno@gmail.com>
To: linux-usb@vger.kernel.org
Cc: Mathias Nyman <mathias.nyman@linux.intel.com>,
	linux-stable <stable@vger.kernel.org>
Subject: [PATCH] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE()
Date: Wed, 20 Dec 2017 03:14:09 +0900	[thread overview]
Message-ID: <20171220031406.9B5E.F48FD4B1@gmail.com> (raw)

As USB_DT_USB_SSP_CAP_SIZE() takes SSAC value as an argument, the low
bound of the size for struct usb_ssp_cap_descriptor should be described
by USB_DT_USB_SSP_CAP_SIZE(0), not by USB_DT_USB_SSP_CAP_SIZE(1)

The type-specific length check patch was added to stable and needs to be
fixed as well.

Fixes: 81cf4a45360f ("USB: core: Add type-specific length check of BOS
descriptors")
Cc: linux-stable <stable@vger.kernel.org>
Cc: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Masakazu Mokuno <masakazu.mokuno@gmail.com>

-- 

 drivers/usb/core/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 78e92d2..33a3ab7 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -911,7 +911,7 @@ void usb_release_bos_descriptor(struct usb_device *dev)
        [USB_CAP_TYPE_WIRELESS_USB] = USB_DT_USB_WIRELESS_CAP_SIZE,
        [USB_CAP_TYPE_EXT]          = USB_DT_USB_EXT_CAP_SIZE,
        [USB_SS_CAP_TYPE]           = USB_DT_USB_SS_CAP_SIZE,
-       [USB_SSP_CAP_TYPE]          = USB_DT_USB_SSP_CAP_SIZE(1),
+       [USB_SSP_CAP_TYPE]          = USB_DT_USB_SSP_CAP_SIZE(0),
        [CONTAINER_ID_TYPE]         = USB_DT_USB_SS_CONTN_ID_SIZE,
        [USB_PTM_CAP_TYPE]          = USB_DT_USB_PTM_ID_SIZE,
 };

-- 
Masakazu Mokuno

             reply	other threads:[~2017-12-19 18:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-19 18:14 Masakazu Mokuno [this message]
2018-01-09 15:06 ` [PATCH] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() Greg KH
2018-01-11 15:47   ` Masakazu Mokuno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171220031406.9B5E.F48FD4B1@gmail.com \
    --to=masakazu.mokuno@gmail.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=mathias.nyman@linux.intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).