Message ID | 20240510121355.3241456-4-hadess@hadess.net (mailing list archive) |
---|---|
State | Accepted |
Commit | 1ba9e5f21ca2bd2e60a9fec9f520caf800d56d60 |
Headers | show |
Series | Fix a number of static analysis issues | expand |
Context | Check | Description |
---|---|---|
tedd_an/pre-ci_am | success | Success |
tedd_an/CheckPatch | success | CheckPatch PASS |
tedd_an/GitLint | fail | WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search 4: B1 Line exceeds max length (103>80): "bluez-5.75/client/gatt.c:973:2: negative_return_fn: Function "io_get_fd(io)" returns a negative number." 5: B1 Line exceeds max length (115>80): "bluez-5.75/client/gatt.c:973:2: negative_returns: "io_get_fd(io)" is passed to a parameter that cannot be negative." 6: B3 Line contains hard tab characters (\t): "971| msg.msg_iovlen = iovlen;" 8: B3 Line contains hard tab characters (\t): "973|-> ret = sendmsg(io_get_fd(io), &msg, MSG_NOSIGNAL);" 9: B3 Line contains hard tab characters (\t): "974| if (ret < 0) {" 10: B3 Line contains hard tab characters (\t): "975| ret = -errno;" 13: B1 Line exceeds max length (104>80): "bluez-5.75/client/gatt.c:1049:2: negative_return_fn: Function "io_get_fd(io)" returns a negative number." 15: B1 Line exceeds max length (105>80): "bluez-5.75/client/gatt.c:1062:2: negative_returns: "fd" is passed to a parameter that cannot be negative." 16: B3 Line contains hard tab characters (\t): "1060| msg.msg_iovlen = 1;" 18: B3 Line contains hard tab characters (\t): "1062|-> bytes_read = recvmsg(fd, &msg, MSG_DONTWAIT);" 19: B3 Line contains hard tab characters (\t): "1063| if (bytes_read < 0) {" 20: B3 Line contains hard tab characters (\t): "1064| bt_shell_printf("recvmsg: %s", strerror(errno));" |
tedd_an/IncrementalBuild | success | Incremental Build PASS |
diff --git a/client/gatt.c b/client/gatt.c index 3aaa7a9361b9..6c7603985172 100644 --- a/client/gatt.c +++ b/client/gatt.c @@ -966,11 +966,15 @@ static int sock_send(struct io *io, struct iovec *iov, size_t iovlen) struct msghdr msg; int ret; + ret = io_get_fd(io); + if (ret < 0) + return ret; + memset(&msg, 0, sizeof(msg)); msg.msg_iov = iov; msg.msg_iovlen = iovlen; - ret = sendmsg(io_get_fd(io), &msg, MSG_NOSIGNAL); + ret = sendmsg(ret, &msg, MSG_NOSIGNAL); if (ret < 0) { ret = -errno; bt_shell_printf("sendmsg: %s", strerror(-ret)); @@ -1052,6 +1056,11 @@ static bool sock_read(struct io *io, void *user_data) if (io != notify_io.io && !chrc) return true; + if (fd < 0) { + bt_shell_printf("recvmsg: %s", strerror(-fd)); + return false; + } + iov.iov_base = buf; iov.iov_len = sizeof(buf);