From 2e42ca628b52aa7b8113d718abe6c112d34e13d1 Mon Sep 17 00:00:00 2001 From: Anmolpreet Kaur Date: Fri, 18 Aug 2023 02:45:47 +0530 Subject: [PATCH] securemsm-kernel: Fix format-specifier errors Moving to a new kernel version has led to enablement of new compiler warnings. These issues came during compilation enablement of securemsm modules for sun. Change-Id: Id807a642b9465dda79680c28d4a6eeef64a45eba Signed-off-by: Anmolpreet Kaur --- qseecom/qseecom.c | 8 ++++---- smcinvoke/smcinvoke.c | 16 ++++++++-------- smcinvoke/smcinvoke_kernel.c | 6 +++--- smcinvoke/trace_smcinvoke.h | 7 ++++--- tz_log/tz_log.c | 10 +++++----- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/qseecom/qseecom.c b/qseecom/qseecom.c index 2d2de1c1bb..0a9d3d5827 100644 --- a/qseecom/qseecom.c +++ b/qseecom/qseecom.c @@ -3132,7 +3132,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data, ret = __qseecom_cleanup_app(data); if (ret && !app_crash) { - pr_err("cleanup app failed, pending ioctl:%d\n", data->ioctl_count); + pr_err("cleanup app failed, pending ioctl:%d\n", data->ioctl_count.counter); return ret; } @@ -9556,19 +9556,19 @@ static int qseecom_register_heap_shmbridge(struct platform_device *pdev, node = of_parse_phandle(pdev->dev.of_node, heap_mem_region_name, 0); if (!node) { - pr_err("unable to parse memory-region of heap %d\n", heap_mem_region_name); + pr_err("unable to parse memory-region of heap %s\n", heap_mem_region_name); return -EINVAL; } rmem = of_reserved_mem_lookup(node); if (!rmem) { - pr_err("unable to acquire memory-region of heap %d\n", heap_mem_region_name); + pr_err("unable to acquire memory-region of heap %s\n", heap_mem_region_name); return -EINVAL; } heap_pa = rmem->base; heap_size = (size_t)rmem->size; - pr_debug("get heap %d info: shmbridge created\n", heap_mem_region_name); + pr_debug("get heap %s info: shmbridge created\n", heap_mem_region_name); return qtee_shmbridge_register(heap_pa, heap_size, ns_vmids, ns_vm_perms, 1, PERM_READ | PERM_WRITE, handle); diff --git a/smcinvoke/smcinvoke.c b/smcinvoke/smcinvoke.c index 67a9bdf290..c89baadfaf 100644 --- a/smcinvoke/smcinvoke.c +++ b/smcinvoke/smcinvoke.c @@ -538,7 +538,7 @@ static void smcinvoke_shmbridge_post_process(void) do { ret = qtee_shmbridge_deregister(handle); if (unlikely(ret)) { - pr_err_ratelimited("SHM failed: ret:%d ptr:0x%x h:%#llx\n", + pr_err_ratelimited("SHM failed: ret:%d ptr:0x%p h:%#llx\n", ret, dmabuf_to_free, handle); @@ -831,10 +831,10 @@ static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj) if (shmbridge_handle) ret = qtee_shmbridge_deregister(shmbridge_handle); if (ret) { - pr_err("Error:%d delete bridge failed leaking memory 0x%x\n", + pr_err("Error:%d delete bridge failed leaking memory 0x%p\n", ret, dmabuf_to_free); if (ret == -EBUSY) { - pr_err("EBUSY: we postpone it 0x%x\n", + pr_err("EBUSY: we postpone it 0x%p\n", dmabuf_to_free); entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (entry) { @@ -1193,7 +1193,7 @@ static int32_t smcinvoke_map_mem_region_locked(struct smcinvoke_mem_obj* mem_obj sgt = dma_buf_map_attachment(buf_attach, DMA_BIDIRECTIONAL); if (IS_ERR(sgt)) { - pr_err("mapping dma buffers failed, ret: %d\n", + pr_err("mapping dma buffers failed, ret: %ld\n", PTR_ERR(sgt)); ret = OBJECT_ERROR_KMEM; goto out; @@ -1614,7 +1614,7 @@ static void process_tzcb_req(void *buf, size_t buf_len, struct file **arr_filp) uint16_t server_id = 0; if (buf_len < sizeof(struct smcinvoke_tzcb_req)) { - pr_err("smaller buffer length : %u\n", buf_len); + pr_err("smaller buffer length : %zu\n", buf_len); return; } @@ -2452,7 +2452,7 @@ static void add_mem_obj_info_to_async_side_channel_locked(void *buf, size_t buf_ msg->count = index; - pr_debug("Added %d memory objects to the side channel, total size = %d\n", index, used); + pr_debug("Added %lu memory objects to the side channel, total size = %zu\n", index, used); return; } @@ -2631,7 +2631,7 @@ static long process_accept_req(struct file *filp, unsigned int cmd, * new cb requests. */ if (!cb_txn) { - pr_err_ratelimited("%s txn %d either invalid or removed from Q\n", + pr_err_ratelimited("%s txn %llu either invalid or removed from Q\n", __func__, user_args.txn_id); goto start_waiting_for_requests; } @@ -3082,7 +3082,7 @@ int smcinvoke_release_filp(struct file *filp) mutex_lock(&object_postprocess_lock); list_add_tail(&entry->list, &g_object_postprocess); mutex_unlock(&object_postprocess_lock); - pr_debug("Object release list: added a handle:0x%lx\n", tzhandle); + pr_debug("Object release list: added a handle:%u\n", tzhandle); __wakeup_postprocess_kthread(&smcinvoke[OBJECT_WORKER_THREAD]); } diff --git a/smcinvoke/smcinvoke_kernel.c b/smcinvoke/smcinvoke_kernel.c index a1b38708dc..5090c14037 100644 --- a/smcinvoke/smcinvoke_kernel.c +++ b/smcinvoke/smcinvoke_kernel.c @@ -254,7 +254,7 @@ static int invoke_over_smcinvoke(void *cxt, struct smcinvoke_obj obj = argptr[i].o; if (obj.fd >= 0) { - pr_err("Close OO[%zu].fd = %d\n", i, obj.fd); + pr_err("Close OO[%zu].fd = %lld\n", i, obj.fd); close_fd(obj.fd); } } @@ -383,7 +383,7 @@ static int __qseecom_start_app(struct qseecom_handle **handle, int ret = 0; struct qseecom_compat_context *cxt = NULL; - pr_warn("%s, start app %s, size %zu\n", + pr_warn("%s, start app %s, size %u\n", __func__, app_name, size); if (app_name == NULL || handle == NULL) { pr_err("app_name is null or invalid handle\n"); @@ -478,7 +478,7 @@ static int __qseecom_send_command(struct qseecom_handle *handle, void *send_buf, __func__, sbuf_len, rbuf_len); if (!handle || !send_buf || !resp_buf || !sbuf_len || !rbuf_len) { - pr_err("One of params is invalid. %s, handle %x, send_buf %x,resp_buf %x,sbuf_len %u, rbuf_len %u\n", + pr_err("One of params is invalid. %s, handle %p, send_buf %p,resp_buf %p,sbuf_len %u, rbuf_len %u\n", __func__, handle, send_buf, resp_buf, sbuf_len, rbuf_len); return -EINVAL; } diff --git a/smcinvoke/trace_smcinvoke.h b/smcinvoke/trace_smcinvoke.h index e6698e4662..45ba356382 100644 --- a/smcinvoke/trace_smcinvoke.h +++ b/smcinvoke/trace_smcinvoke.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #undef TRACE_SYSTEM @@ -60,7 +61,7 @@ TRACE_EVENT(invoke_cmd_handler, __entry->ret = ret; __entry->cmd = cmd; ), - TP_printk("cmd=0x%x (%d), response_type=%ld, result=0x%x (%d), ret=%d", + TP_printk("cmd=0x%x (%d), response_type=%llu, result=0x%x (%d), ret=%d", __entry->cmd, __entry->cmd, __entry->response_type, __entry->result, __entry->result, __entry->ret) ); @@ -166,7 +167,7 @@ TRACE_EVENT(prepare_send_scm_msg, __entry->response_type = response_type; __entry->result = result; ), - TP_printk("response_type=0x%lx (%ld), result=0x%x (%d)", + TP_printk("response_type=%llu (%llu), result=0x%x (%d)", __entry->response_type, __entry->response_type, __entry->result, __entry->result) ); @@ -186,7 +187,7 @@ TRACE_EVENT(marshal_in_invoke_req, __entry->cb_server_fd = cb_server_fd; __entry->tzhandle = tzhandle; ), - TP_printk("OI[%d]: fd=0x%x cb_server_fd=0x%x tzhandle=0x%x", + TP_printk("OI[%d]: fd=%lld cb_server_fd=0x%x tzhandle=0x%x", __entry->i, __entry->fd, __entry->cb_server_fd, __entry->tzhandle) ); diff --git a/tz_log/tz_log.c b/tz_log/tz_log.c index 50fa178287..dc0e2e50f7 100644 --- a/tz_log/tz_log.c +++ b/tz_log/tz_log.c @@ -1358,7 +1358,7 @@ static ssize_t tzdbg_fs_read_encrypted(int tz_id, char __user *buf, stat->display_offset += ret; stat->display_len -= ret; pr_debug("ret = %d, offset = %d\n", ret, (int)(*offp)); - pr_debug("display_len = %d, offset = %d\n", + pr_debug("display_len = %lu, offset = %lu\n", stat->display_len, stat->display_offset); return ret; } @@ -1479,7 +1479,7 @@ static int tzdbg_register_qsee_log_buf(struct platform_device *pdev) ret = qcom_scm_register_qsee_log_buf(coh_pmem, qseelog_buf_size); if (ret != QSEOS_RESULT_SUCCESS) { pr_err( - "%s: scm_call to register log buf failed, resp result =%lld\n", + "%s: scm_call to register log buf failed, resp result =%d\n", __func__, ret); goto exit_dereg_bridge; } @@ -1697,7 +1697,7 @@ static int __update_rmlog_base(struct platform_device *pdev, rmlog_address, rmlog_size); if (!tzdbg.rmlog_virt_iobase) { - dev_err(&pdev->dev, "ERROR could not ioremap: start=%pr, len=%u\n", + dev_err(&pdev->dev, "ERROR could not ioremap: start=%u, len=%u\n", rmlog_address, tzdbg.rmlog_rw_buf_size); return -ENXIO; } @@ -1729,7 +1729,7 @@ static int tzdbg_get_tz_version(void) __func__, ret); return ret; } - pr_warn("tz diag version is %x\n", version); + pr_warn("tz diag version is %llu\n", version); tzdbg.tz_diag_major_version = ((version >> TZBSP_FVER_MAJOR_SHIFT) & TZBSP_FVER_MAJOR_MINOR_MASK); tzdbg.tz_diag_minor_version = @@ -1763,7 +1763,7 @@ static void tzdbg_query_encrypted_log(void) pr_err("scm_call QUERY_ENCR_LOG_FEATURE failed ret %d\n", ret); tzdbg.is_encrypted_log_enabled = false; } else { - pr_warn("encrypted qseelog enabled is %d\n", enabled); + pr_warn("encrypted qseelog enabled is %llu\n", enabled); tzdbg.is_encrypted_log_enabled = enabled; } }