2020-11-20 20:08:28

by Tedd Ho-Jeong An

[permalink] [raw]
Subject: [PATCH 6/6] lib: Fix the unchecked return value

This patch fixes the unchecked return value.
---
lib/hci.c | 6 ++++--
lib/sdp.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/hci.c b/lib/hci.c
index 4bd33f241..53af0a114 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -1246,12 +1246,14 @@ int hci_send_req(int dd, struct hci_request *r, int to)

failed:
err = errno;
- setsockopt(dd, SOL_HCI, HCI_FILTER, &of, sizeof(of));
+ if (setsockopt(dd, SOL_HCI, HCI_FILTER, &of, sizeof(of)) < 0)
+ err = errno;
errno = err;
return -1;

done:
- setsockopt(dd, SOL_HCI, HCI_FILTER, &of, sizeof(of));
+ if (setsockopt(dd, SOL_HCI, HCI_FILTER, &of, sizeof(of)) < 0)
+ return -1;
return 0;
}

diff --git a/lib/sdp.c b/lib/sdp.c
index ebaed3e40..844ae0d25 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -4705,7 +4705,8 @@ static int sdp_connect_l2cap(const bdaddr_t *src,

if (flags & SDP_WAIT_ON_CLOSE) {
struct linger l = { .l_onoff = 1, .l_linger = 1 };
- setsockopt(sk, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
+ if (setsockopt(sk, SOL_SOCKET, SO_LINGER, &l, sizeof(l)) < 0)
+ return -1;
}

if ((flags & SDP_LARGE_MTU) &&
--
2.25.4