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

Commit 470ff67c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: Fix format specifiers in debug statements"

parents 4906dc55 27709872

net/ipc_router/ipc_router_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ static int process_control_msg(struct msm_ipc_router_xprt_info *xprt_info, 
	struct rr_header_v1 *hdr;



	if (pkt->length != sizeof(*msg)) {

		pr_err("%s: r2r msg size %d != %d\n", __func__, pkt->length,

		pr_err("%s: r2r msg size %d != %zu\n", __func__, pkt->length,

			sizeof(*msg));

		return -EINVAL;

	}

net/ipc_router/ipc_router_security.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int msm_ipc_config_sec_rules(void *arg) 
		return -EINVAL;



	if (sec_rules_arg.num_group_info > (SIZE_MAX / sizeof(gid_t))) {

		pr_err("%s: Integer Overflow %d * %d\n", __func__,

		pr_err("%s: Integer Overflow %zu * %d\n", __func__,

			sizeof(gid_t), sec_rules_arg.num_group_info);

		return -EINVAL;

	}

net/ipc_router/ipc_router_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int msm_ipc_router_ioctl(struct socket *sock, 
		if (server_arg.num_entries_in_array) {

			if (server_arg.num_entries_in_array >

				(SIZE_MAX / sizeof(*srv_info))) {

				pr_err("%s: Integer Overflow %d * %d\n",

				pr_err("%s: Integer Overflow %zu * %d\n",

					__func__, sizeof(*srv_info),

					server_arg.num_entries_in_array);

				ret = -EINVAL;