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

Commit 5c7d2dd2 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Make data pointer of hci_recv_stream_fragment const 



The data pointer provided to hci_recv_stream_fragment function should
have been marked const. The function has no business in modifying the
original data. So fix this now.

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

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, 
void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);



int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb);

int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);

int hci_recv_stream_fragment(struct hci_dev *hdev, const void *data, int count);



void hci_init_sysfs(struct hci_dev *hdev);

void hci_conn_init_sysfs(struct hci_conn *conn);

net/bluetooth/hci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -3320,7 +3320,7 @@ int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb) 
}

EXPORT_SYMBOL(hci_recv_frame);



static int hci_reassembly(struct hci_dev *hdev, int type, void *data,

static int hci_reassembly(struct hci_dev *hdev, int type, const void *data,

			  int count, __u8 index)

{

	int len = 0;
@@ -3430,7 +3430,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data, 


#define STREAM_REASSEMBLY 0



int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)

int hci_recv_stream_fragment(struct hci_dev *hdev, const void *data, int count)

{

	int type;

	int rem = 0;
@@ -3439,7 +3439,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count) 
		struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY];



		if (!skb) {

			struct { char type; } *pkt;

			const struct { char type; } *pkt;



			/* Start of the frame */

			pkt = data;