diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-07-18 19:24:26 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-07-18 19:24:42 +0530 |
| commit | 76a94128641b3e7699c4de492cf9127d5dbd2898 (patch) | |
| tree | dc33eaeeaea2bd8644f2e22fb0fc074b73fd4068 /net | |
| parent | 5dd3308e81c660adaf95ff9d1efd699d0ad94b41 (diff) | |
| parent | a62a87169d61229a5e55364cf80d168860298ad2 (diff) | |
| download | kernel_samsung_aries-76a94128641b3e7699c4de492cf9127d5dbd2898.zip kernel_samsung_aries-76a94128641b3e7699c4de492cf9127d5dbd2898.tar.gz kernel_samsung_aries-76a94128641b3e7699c4de492cf9127d5dbd2898.tar.bz2 | |
Merge tag 'v3.0.86' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
This is the 3.0.86 stable release
Change-Id: Ica791b3df05d7cc9df5a9c3eebe6e70a782a2113
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 | ||||
| -rw-r--r-- | net/ceph/auth_none.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 5a0ce73..38e3dec 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1728,6 +1728,9 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %d", conn, code, ident, dlen); + if (conn->mtu < L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE) + return NULL; + len = L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE + dlen; count = min_t(unsigned int, conn->mtu, len); diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c index 214c2bb..9f78c5f 100644 --- a/net/ceph/auth_none.c +++ b/net/ceph/auth_none.c @@ -39,6 +39,11 @@ static int should_authenticate(struct ceph_auth_client *ac) return xi->starting; } +static int build_request(struct ceph_auth_client *ac, void *buf, void *end) +{ + return 0; +} + /* * the generic auth code decode the global_id, and we carry no actual * authenticate state, so nothing happens here. @@ -107,6 +112,7 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = { .destroy = destroy, .is_authenticated = is_authenticated, .should_authenticate = should_authenticate, + .build_request = build_request, .handle_reply = handle_reply, .create_authorizer = ceph_auth_none_create_authorizer, .destroy_authorizer = ceph_auth_none_destroy_authorizer, |