diff options
Diffstat (limited to '0007-Bluetooth-L2CAP-Fix-build-errors-in-some-archs.patch')
| -rw-r--r-- | 0007-Bluetooth-L2CAP-Fix-build-errors-in-some-archs.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/0007-Bluetooth-L2CAP-Fix-build-errors-in-some-archs.patch b/0007-Bluetooth-L2CAP-Fix-build-errors-in-some-archs.patch deleted file mode 100644 index b399cefe0e85..000000000000 --- a/0007-Bluetooth-L2CAP-Fix-build-errors-in-some-archs.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e8fcbce5424966ddbe9e426c163b2e63ff91b789 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Fri, 12 Aug 2022 15:33:57 -0700 -Subject: [PATCH 07/73] Bluetooth: L2CAP: Fix build errors in some archs - -commit b840304fb46cdf7012722f456bce06f151b3e81b upstream. - -This attempts to fix the follow errors: - -In function 'memcmp', - inlined from 'bacmp' at ./include/net/bluetooth/bluetooth.h:347:9, - inlined from 'l2cap_global_chan_by_psm' at - net/bluetooth/l2cap_core.c:2003:15: -./include/linux/fortify-string.h:44:33: error: '__builtin_memcmp' -specified bound 6 exceeds source size 0 [-Werror=stringop-overread] - 44 | #define __underlying_memcmp __builtin_memcmp - | ^ -./include/linux/fortify-string.h:420:16: note: in expansion of macro -'__underlying_memcmp' - 420 | return __underlying_memcmp(p, q, size); - | ^~~~~~~~~~~~~~~~~~~ -In function 'memcmp', - inlined from 'bacmp' at ./include/net/bluetooth/bluetooth.h:347:9, - inlined from 'l2cap_global_chan_by_psm' at - net/bluetooth/l2cap_core.c:2004:15: -./include/linux/fortify-string.h:44:33: error: '__builtin_memcmp' -specified bound 6 exceeds source size 0 [-Werror=stringop-overread] - 44 | #define __underlying_memcmp __builtin_memcmp - | ^ -./include/linux/fortify-string.h:420:16: note: in expansion of macro -'__underlying_memcmp' - 420 | return __underlying_memcmp(p, q, size); - | ^~~~~~~~~~~~~~~~~~~ - -Fixes: 332f1795ca20 ("Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression") -Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - net/bluetooth/l2cap_core.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c -index f18d0c72713f..48fbd0ae882b 100644 ---- a/net/bluetooth/l2cap_core.c -+++ b/net/bluetooth/l2cap_core.c -@@ -1991,11 +1991,11 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, - src_match = !bacmp(&c->src, src); - dst_match = !bacmp(&c->dst, dst); - if (src_match && dst_match) { -- c = l2cap_chan_hold_unless_zero(c); -- if (c) { -- read_unlock(&chan_list_lock); -- return c; -- } -+ if (!l2cap_chan_hold_unless_zero(c)) -+ continue; -+ -+ read_unlock(&chan_list_lock); -+ return c; - } - - /* Closest match */ --- -2.37.3 - |