netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan Elkouby <streetwalkermc@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Dan Elkouby <streetwalkermc@gmail.com>,
	Marcel Holtmann <marcel@holtmann.org>,
	Johan Hedberg <johan.hedberg@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Fabian Henneke <fabian.henneke@gmail.com>,
	Brian Norris <computersforpeace@gmail.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Andrea Parri <andrea.parri@amarulasolutions.com>,
	linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] Bluetooth: hidp: Fix error checks in hidp_get/set_raw_report
Date: Fri,  6 Sep 2019 12:41:57 +0300	[thread overview]
Message-ID: <20190906094158.8854-1-streetwalkermc@gmail.com> (raw)

Commit 48d9cc9d85dd ("Bluetooth: hidp: Let hidp_send_message return
number of queued bytes") changed hidp_send_message to return non-zero
values on success, which some other bits did not expect. This caused
spurious errors to be propagated through the stack, breaking some (all?)
drivers, such as hid-sony for the Dualshock 4 in Bluetooth mode.

Signed-off-by: Dan Elkouby <streetwalkermc@gmail.com>
---
 net/bluetooth/hidp/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 8d889969ae7e..bef84b95e2c4 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -267,7 +267,7 @@ static int hidp_get_raw_report(struct hid_device *hid,
 	set_bit(HIDP_WAITING_FOR_RETURN, &session->flags);
 	data[0] = report_number;
 	ret = hidp_send_ctrl_message(session, report_type, data, 1);
-	if (ret)
+	if (ret < 0)
 		goto err;
 
 	/* Wait for the return of the report. The returned report
@@ -343,7 +343,7 @@ static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum,
 	data[0] = reportnum;
 	set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags);
 	ret = hidp_send_ctrl_message(session, report_type, data, count);
-	if (ret)
+	if (ret < 0)
 		goto err;
 
 	/* Wait for the ACK from the device. */
-- 
2.23.0


             reply	other threads:[~2019-09-06  9:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-06  9:41 Dan Elkouby [this message]
2019-09-06 10:13 ` [PATCH] Bluetooth: hidp: Fix error checks in hidp_get/set_raw_report Dan Carpenter
2019-09-06 10:40   ` Dan Elkouby
2019-09-06 10:58     ` Dan Carpenter
2019-09-06 11:06   ` [PATCH] Bluetooth: hidp: Fix assumptions on the return value of hidp_send_message Dan Elkouby
2019-09-06 11:11     ` Dan Carpenter
2019-09-06 11:31     ` Jiri Kosina
2019-09-06 13:57       ` Marcel Holtmann
2019-09-23 20:33         ` Andrey Smirnov
2019-09-06 13:56 ` [PATCH] Bluetooth: hidp: Fix error checks in hidp_get/set_raw_report Marcel Holtmann
2019-09-06 14:05   ` Dan Elkouby
2019-09-06 14:08   ` Dan Carpenter
2019-09-06 14:12     ` Marcel Holtmann

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=20190906094158.8854-1-streetwalkermc@gmail.com \
    --to=streetwalkermc@gmail.com \
    --cc=andrea.parri@amarulasolutions.com \
    --cc=computersforpeace@gmail.com \
    --cc=dan.carpenter@oracle.com \
    --cc=davem@davemloft.net \
    --cc=fabian.henneke@gmail.com \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --cc=netdev@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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).