Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92594a51 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: L2CAP: Fix auto-allocating LE PSM values 



The LE dynamic PSM range is different from BR/EDR (0x0080 - 0x00ff)
and doesn't have requirements relating to parity, so separate checks
are needed.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 114f9f1e

net/bluetooth/l2cap_core.c

+12 −2
Original line number Diff line number Diff line
@@ -197,10 +197,20 @@ int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm) 
		chan->sport = psm;

		err = 0;

	} else {

		u16 p;

		u16 p, start, end, incr;



		if (chan->src_type == BDADDR_BREDR) {

			start = L2CAP_PSM_DYN_START;

			end = L2CAP_PSM_AUTO_END;

			incr = 2;

		} else {

			start = L2CAP_PSM_LE_DYN_START;

			end = L2CAP_PSM_LE_DYN_END;

			incr = 1;

		}



		err = -EINVAL;

		for (p = 0x1001; p < 0x1100; p += 2)

		for (p = start; p <= end; p += incr)

			if (!__l2cap_global_chan_by_addr(cpu_to_le16(p), src)) {

				chan->psm   = cpu_to_le16(p);

				chan->sport = cpu_to_le16(p);