aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2011-06-24 08:38:05 -0400
committerJaikumar Ganesh <jaikumar@google.com>2011-07-18 12:28:02 -0700
commit1752e5327a01247d605515dbba86ad32a493db93 (patch)
tree151d9c18e62535905763bcdb2f680156ddc835a2 /net/bluetooth
parentcacfcdeb500046c3e5cc4d39824b3d5ddf8e4728 (diff)
downloadkernel_samsung_espresso10-1752e5327a01247d605515dbba86ad32a493db93.tar.gz
kernel_samsung_espresso10-1752e5327a01247d605515dbba86ad32a493db93.tar.bz2
kernel_samsung_espresso10-1752e5327a01247d605515dbba86ad32a493db93.zip
Bluetooth: Prevent buffer overflow in l2cap config request
A remote user can provide a small value for the command size field in the command header of an l2cap configuration request, resulting in an integer underflow when subtracting the size of the configuration request header. This results in copying a very large amount of data via memcpy() and destroying the kernel heap. Check for underflow. Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com> Cc: stable <stable@kernel.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9c7bccfcc72..38efc9f32c4 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2535,7 +2535,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
/* Reject if config buffer is too small. */
len = cmd_len - sizeof(*req);
- if (chan->conf_len + len > sizeof(chan->conf_req)) {
+ if (len < 0 || chan->conf_len + len > sizeof(chan->conf_req)) {
l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
l2cap_build_conf_rsp(chan, rsp,
L2CAP_CONF_REJECT, flags), rsp);