forked from luck/tmp_suning_uos_patched
[BLUETOOTH] rfcomm endianness bug: param_mask is little-endian on the wire
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6ba9c755e5
commit
e8db8c9910
|
@ -854,7 +854,7 @@ int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
|
|||
rpn->flow_ctrl = flow_ctrl_settings;
|
||||
rpn->xon_char = xon_char;
|
||||
rpn->xoff_char = xoff_char;
|
||||
rpn->param_mask = param_mask;
|
||||
rpn->param_mask = cpu_to_le16(param_mask);
|
||||
|
||||
*ptr = __fcs(buf); ptr++;
|
||||
|
||||
|
@ -1343,7 +1343,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
/* Check for sane values, ignore/accept bit_rate, 8 bits, 1 stop bit,
|
||||
* no parity, no flow control lines, normal XON/XOFF chars */
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_BITRATE) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_BITRATE)) {
|
||||
bit_rate = rpn->bit_rate;
|
||||
if (bit_rate != RFCOMM_RPN_BR_115200) {
|
||||
BT_DBG("RPN bit rate mismatch 0x%x", bit_rate);
|
||||
|
@ -1352,7 +1352,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_DATA) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_DATA)) {
|
||||
data_bits = __get_rpn_data_bits(rpn->line_settings);
|
||||
if (data_bits != RFCOMM_RPN_DATA_8) {
|
||||
BT_DBG("RPN data bits mismatch 0x%x", data_bits);
|
||||
|
@ -1361,7 +1361,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_STOP) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_STOP)) {
|
||||
stop_bits = __get_rpn_stop_bits(rpn->line_settings);
|
||||
if (stop_bits != RFCOMM_RPN_STOP_1) {
|
||||
BT_DBG("RPN stop bits mismatch 0x%x", stop_bits);
|
||||
|
@ -1370,7 +1370,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_PARITY) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_PARITY)) {
|
||||
parity = __get_rpn_parity(rpn->line_settings);
|
||||
if (parity != RFCOMM_RPN_PARITY_NONE) {
|
||||
BT_DBG("RPN parity mismatch 0x%x", parity);
|
||||
|
@ -1379,7 +1379,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_FLOW) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_FLOW)) {
|
||||
flow_ctrl = rpn->flow_ctrl;
|
||||
if (flow_ctrl != RFCOMM_RPN_FLOW_NONE) {
|
||||
BT_DBG("RPN flow ctrl mismatch 0x%x", flow_ctrl);
|
||||
|
@ -1388,7 +1388,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_XON) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_XON)) {
|
||||
xon_char = rpn->xon_char;
|
||||
if (xon_char != RFCOMM_RPN_XON_CHAR) {
|
||||
BT_DBG("RPN XON char mismatch 0x%x", xon_char);
|
||||
|
@ -1397,7 +1397,7 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_
|
|||
}
|
||||
}
|
||||
|
||||
if (rpn->param_mask & RFCOMM_RPN_PM_XOFF) {
|
||||
if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_XOFF)) {
|
||||
xoff_char = rpn->xoff_char;
|
||||
if (xoff_char != RFCOMM_RPN_XOFF_CHAR) {
|
||||
BT_DBG("RPN XOFF char mismatch 0x%x", xoff_char);
|
||||
|
|
Loading…
Reference in New Issue
Block a user