Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
+8
-2
net/bluetooth/l2cap.c
+8
-2
net/bluetooth/l2cap.c
···
585
585
goto done;
586
586
}
587
587
588
+
if (la->l2_psm > 0 && btohs(la->l2_psm) < 0x1001 &&
589
+
!capable(CAP_NET_BIND_SERVICE)) {
590
+
err = -EACCES;
591
+
goto done;
592
+
}
593
+
588
594
write_lock_bh(&l2cap_sk_list.lock);
589
595
590
596
if (la->l2_psm && __l2cap_get_sock_by_addr(la->l2_psm, &la->l2_bdaddr)) {
···
2156
2150
2157
2151
str += sprintf(str, "%s %s %d %d 0x%4.4x 0x%4.4x %d %d 0x%x\n",
2158
2152
batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst),
2159
-
sk->sk_state, pi->psm, pi->scid, pi->dcid, pi->imtu,
2160
-
pi->omtu, pi->link_mode);
2153
+
sk->sk_state, btohs(pi->psm), pi->scid, pi->dcid,
2154
+
pi->imtu, pi->omtu, pi->link_mode);
2161
2155
}
2162
2156
2163
2157
read_unlock_bh(&l2cap_sk_list.lock);