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

Commit 66a1be74 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

nfc: constify several pointers to u8, char and sk_buff 



[ Upstream commit 3df40eb3a2ea58bf404a38f15a7a2768e4762cb0 ]

Several functions receive pointers to u8, char or sk_buff but do not
modify the contents so make them const.  This allows doing the same for
local variables and in total makes the code a little bit safer.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Stable-dep-of: 0d9b41daa590 ("nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fea2104e

include/net/nfc/nfc.h

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk, 
struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);



int nfc_set_remote_general_bytes(struct nfc_dev *dev,

				 u8 *gt, u8 gt_len);

				 const u8 *gt, u8 gt_len);

u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);



int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, 
		       u8 comm_mode, u8 rf_mode);



int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,

		     u8 *gb, size_t gb_len);

		     const u8 *gb, size_t gb_len);

int nfc_tm_deactivated(struct nfc_dev *dev);

int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);

net/nfc/core.c

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx) 
	return rc;

}



int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)

int nfc_set_remote_general_bytes(struct nfc_dev *dev, const u8 *gb, u8 gb_len)

{

	pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);
@@ -663,7 +663,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb) 
EXPORT_SYMBOL(nfc_tm_data_received);



int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,

		     u8 *gb, size_t gb_len)

		     const u8 *gb, size_t gb_len)

{

	int rc;

net/nfc/hci/llc_shdlc.c

+5 −5
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z) 
		return ((y >= x) || (y < z)) ? true : false;

}



static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc,

static struct sk_buff *llc_shdlc_alloc_skb(const struct llc_shdlc *shdlc,

					   int payload_len)

{

	struct sk_buff *skb;
@@ -137,7 +137,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, 
}



/* immediately sends an S frame. */

static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc,

static int llc_shdlc_send_s_frame(const struct llc_shdlc *shdlc,

				  enum sframe_type sframe_type, int nr)

{

	int r;
@@ -159,7 +159,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, 
}



/* immediately sends an U frame. skb may contain optional payload */

static int llc_shdlc_send_u_frame(struct llc_shdlc *shdlc,

static int llc_shdlc_send_u_frame(const struct llc_shdlc *shdlc,

				  struct sk_buff *skb,

				  enum uframe_modifier uframe_modifier)

{
@@ -361,7 +361,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r) 
	wake_up(shdlc->connect_wq);

}



static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)

static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc)

{

	struct sk_buff *skb;
@@ -377,7 +377,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc) 
	return llc_shdlc_send_u_frame(shdlc, skb, U_FRAME_RSET);

}



static int llc_shdlc_connect_send_ua(struct llc_shdlc *shdlc)

static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc)

{

	struct sk_buff *skb;

net/nfc/llcp.h

+4 −4
Original line number Diff line number Diff line
@@ -221,15 +221,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock); 


/* TLV API */

int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,

			  u8 *tlv_array, u16 tlv_array_len);

			  const u8 *tlv_array, u16 tlv_array_len);

int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,

				  u8 *tlv_array, u16 tlv_array_len);

				  const u8 *tlv_array, u16 tlv_array_len);



/* Commands API */

void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);

u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length);

u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length);

struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap);

struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,

struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,

						  size_t uri_len);

void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);

void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);

net/nfc/llcp_commands.c

+25 −21
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "nfc.h"

#include "llcp.h"



static u8 llcp_tlv_length[LLCP_TLV_MAX] = {

static const u8 llcp_tlv_length[LLCP_TLV_MAX] = {

	0,

	1, /* VERSION */

	2, /* MIUX */
@@ -29,7 +29,7 @@ static u8 llcp_tlv_length[LLCP_TLV_MAX] = { 


};



static u8 llcp_tlv8(u8 *tlv, u8 type)

static u8 llcp_tlv8(const u8 *tlv, u8 type)

{

	if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])

		return 0;
@@ -37,7 +37,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type) 
	return tlv[2];

}



static u16 llcp_tlv16(u8 *tlv, u8 type)

static u16 llcp_tlv16(const u8 *tlv, u8 type)

{

	if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])

		return 0;
@@ -46,37 +46,37 @@ static u16 llcp_tlv16(u8 *tlv, u8 type) 
}





static u8 llcp_tlv_version(u8 *tlv)

static u8 llcp_tlv_version(const u8 *tlv)

{

	return llcp_tlv8(tlv, LLCP_TLV_VERSION);

}



static u16 llcp_tlv_miux(u8 *tlv)

static u16 llcp_tlv_miux(const u8 *tlv)

{

	return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff;

}



static u16 llcp_tlv_wks(u8 *tlv)

static u16 llcp_tlv_wks(const u8 *tlv)

{

	return llcp_tlv16(tlv, LLCP_TLV_WKS);

}



static u16 llcp_tlv_lto(u8 *tlv)

static u16 llcp_tlv_lto(const u8 *tlv)

{

	return llcp_tlv8(tlv, LLCP_TLV_LTO);

}



static u8 llcp_tlv_opt(u8 *tlv)

static u8 llcp_tlv_opt(const u8 *tlv)

{

	return llcp_tlv8(tlv, LLCP_TLV_OPT);

}



static u8 llcp_tlv_rw(u8 *tlv)

static u8 llcp_tlv_rw(const u8 *tlv)

{

	return llcp_tlv8(tlv, LLCP_TLV_RW) & 0xf;

}



u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length)

u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length)

{

	u8 *tlv, length;
@@ -130,7 +130,7 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap) 
	return sdres;

}



struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,

struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,

						  size_t uri_len)

{

	struct nfc_llcp_sdp_tlv *sdreq;
@@ -190,9 +190,10 @@ void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head) 
}



int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,

			  u8 *tlv_array, u16 tlv_array_len)

			  const u8 *tlv_array, u16 tlv_array_len)

{

	u8 *tlv = tlv_array, type, length, offset = 0;

	const u8 *tlv = tlv_array;

	u8 type, length, offset = 0;



	pr_debug("TLV array length %d\n", tlv_array_len);
@@ -239,9 +240,10 @@ int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local, 
}



int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,

				  u8 *tlv_array, u16 tlv_array_len)

				  const u8 *tlv_array, u16 tlv_array_len)

{

	u8 *tlv = tlv_array, type, length, offset = 0;

	const u8 *tlv = tlv_array;

	u8 type, length, offset = 0;



	pr_debug("TLV array length %d\n", tlv_array_len);
@@ -295,7 +297,7 @@ static struct sk_buff *llcp_add_header(struct sk_buff *pdu, 
	return pdu;

}



static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, u8 *tlv,

static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, const u8 *tlv,

				    u8 tlv_length)

{

	/* XXX Add an skb length check */
@@ -389,9 +391,10 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) 
{

	struct nfc_llcp_local *local;

	struct sk_buff *skb;

	u8 *service_name_tlv = NULL, service_name_tlv_length;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length, rw;

	const u8 *service_name_tlv = NULL;

	const u8 *miux_tlv = NULL;

	const u8 *rw_tlv = NULL;

	u8 service_name_tlv_length, miux_tlv_length,  rw_tlv_length, rw;

	int err;

	u16 size = 0;

	__be16 miux;
@@ -465,8 +468,9 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) 
{

	struct nfc_llcp_local *local;

	struct sk_buff *skb;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length, rw;

	const u8 *miux_tlv = NULL;

	const u8 *rw_tlv = NULL;

	u8 miux_tlv_length, rw_tlv_length, rw;

	int err;

	u16 size = 0;

	__be16 miux;