summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2020-08-06 11:17:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-17 08:31:21 +0200
commit3dede8ebf46338473143a1e792cc2cacc244f1f2 (patch)
tree7bfe048c5161fd0c9b1593bffa5bf81b0f8bcbf3 /include
parent122414e2d2cba74dc154263cabca9560ff8011ac (diff)
downloadlinux-stable-3dede8ebf46338473143a1e792cc2cacc244f1f2.tar.gz
linux-stable-3dede8ebf46338473143a1e792cc2cacc244f1f2.tar.bz2
linux-stable-3dede8ebf46338473143a1e792cc2cacc244f1f2.zip
Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel
commit f19425641cb2572a33cb074d5e30283720bd4d22 upstream. Only sockets will have the chan->data set to an actual sk, channels like A2MP would have its own data which would likely cause a crash when calling sk_filter, in order to fix this a new callback has been introduced so channels can implement their own filtering if necessary. Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/l2cap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 8f1e6a7a2df8..1d1232917de7 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -665,6 +665,8 @@ struct l2cap_ops {
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
unsigned long hdr_len,
unsigned long len, int nb);
+ int (*filter) (struct l2cap_chan * chan,
+ struct sk_buff *skb);
};
struct l2cap_conn {