From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [1/4] USB: serial: keyspan_pda: fix modem-status error handling From: Johan Hovold Message-Id: <20180704150219.27389-1-johan@kernel.org> Date: Wed, 4 Jul 2018 17:02:16 +0200 To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, stable , Benny Halevy List-ID: Rml4IGJyb2tlbiBtb2RlbS1zdGF0dXMgZXJyb3IgaGFuZGxpbmcgd2hpY2ggY291bGQgbGVhZCB0 byBiaXRzIG9mIHNsYWIKZGF0YSBsZWFraW5nIHRvIHVzZXIgc3BhY2UuCgpGaXhlczogM2IzNmE4 ZmQ2Nzc3ICgidXNiOiBmaXggdW5pbml0aWFsaXplZCB2YXJpYWJsZSB3YXJuaW5nIGluIGtleXNw YW5fcGRhIikKQ2M6IHN0YWJsZSA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gICAgICMgMi42LjI3 CkNjOiBCZW5ueSBIYWxldnkgPGJoYWxldnlAcGFuYXNhcy5jb20+ClNpZ25lZC1vZmYtYnk6IEpv aGFuIEhvdm9sZCA8am9oYW5Aa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3VzYi9zZXJpYWwva2V5 c3Bhbl9wZGEuYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMSBk ZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9rZXlzcGFuX3BkYS5j IGIvZHJpdmVycy91c2Ivc2VyaWFsL2tleXNwYW5fcGRhLmMKaW5kZXggNTE2OTYyNGQ4YjExLi4z OGQ0M2M0YjdjZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9rZXlzcGFuX3BkYS5j CisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9rZXlzcGFuX3BkYS5jCkBAIC0zNjksOCArMzY5LDEw IEBAIHN0YXRpYyBpbnQga2V5c3Bhbl9wZGFfZ2V0X21vZGVtX2luZm8oc3RydWN0IHVzYl9zZXJp YWwgKnNlcmlhbCwKIAkJCSAgICAgMywgLyogZ2V0IHBpbnMgKi8KIAkJCSAgICAgVVNCX1RZUEVf VkVORE9SfFVTQl9SRUNJUF9JTlRFUkZBQ0V8VVNCX0RJUl9JTiwKIAkJCSAgICAgMCwgMCwgZGF0 YSwgMSwgMjAwMCk7Ci0JaWYgKHJjID49IDApCisJaWYgKHJjID09IDEpCiAJCSp2YWx1ZSA9ICpk YXRhOworCWVsc2UgaWYgKHJjID49IDApCisJCXJjID0gLUVJTzsKIAogCWtmcmVlKGRhdGEpOwog CXJldHVybiByYzsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:41194 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbeGDPCv (ORCPT ); Wed, 4 Jul 2018 11:02:51 -0400 From: Johan Hovold To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, stable , Benny Halevy Subject: [PATCH 1/4] USB: serial: keyspan_pda: fix modem-status error handling Date: Wed, 4 Jul 2018 17:02:16 +0200 Message-Id: <20180704150219.27389-1-johan@kernel.org> Sender: stable-owner@vger.kernel.org List-ID: Fix broken modem-status error handling which could lead to bits of slab data leaking to user space. Fixes: 3b36a8fd6777 ("usb: fix uninitialized variable warning in keyspan_pda") Cc: stable # 2.6.27 Cc: Benny Halevy Signed-off-by: Johan Hovold --- drivers/usb/serial/keyspan_pda.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 5169624d8b11..38d43c4b7ce5 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c @@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial, 3, /* get pins */ USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN, 0, 0, data, 1, 2000); - if (rc >= 0) + if (rc == 1) *value = *data; + else if (rc >= 0) + rc = -EIO; kfree(data); return rc; -- 2.18.0