As Linus mentioned in [1], we should get rid of 'get_task_comm()'
entirely and replace it with 'strscpy_pad()' implementation.
'strscpy_pad()' will already make sure comm is NUL-terminated, so
we won't need the explicit final byte termination done in
'get_task_comm()'.
The relevant 'get_task_comm()' users were identified using the
following search pattern:
$ git grep 'get_task_comm*'
[1]. https://lore.kernel.org/all/CAHk-=wi5c=_-FBGo_88CowJd_F-Gi6Ud9d=TALm65ReN7YjrMw@mail.gmail.com/
Signed-off-by: Bhupesh <bhupesh@igalia.com>
---
drivers/connector/cn_proc.c | 2 +-
drivers/dma-buf/sw_sync.c | 2 +-
.../gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 +-
.../drm/amd/amdgpu/amdgpu_eviction_fence.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-
.../gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +-
drivers/gpu/drm/lima/lima_ctx.c | 2 +-
drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
drivers/gpu/drm/panthor/panthor_gem.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +-
drivers/hwtracing/stm/core.c | 2 +-
drivers/tty/tty_audit.c | 2 +-
fs/bcachefs/thread_with_file.c | 2 +-
fs/binfmt_elf.c | 2 +-
fs/binfmt_elf_fdpic.c | 2 +-
fs/ocfs2/cluster/netdebug.c | 1 -
fs/proc/array.c | 2 +-
include/linux/sched.h | 19 -------------------
kernel/audit.c | 6 ++++--
kernel/auditsc.c | 6 ++++--
kernel/sys.c | 2 +-
mm/kmemleak.c | 6 ------
net/bluetooth/hci_sock.c | 2 +-
net/netfilter/nf_tables_api.c | 2 +-
security/integrity/integrity_audit.c | 3 ++-
security/ipe/audit.c | 2 +-
security/landlock/domain.c | 2 +-
security/lsm_audit.c | 7 ++++---
30 files changed, 38 insertions(+), 58 deletions(-)
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 44b19e696176..3c1b07198e10 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -278,7 +278,7 @@ void proc_comm_connector(struct task_struct *task)
ev->what = PROC_EVENT_COMM;
ev->event_data.comm.process_pid = task->pid;
ev->event_data.comm.process_tgid = task->tgid;
- get_task_comm(ev->event_data.comm.comm, task);
+ strscpy_pad(ev->event_data.comm.comm, task->comm);
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c
index 3c20f1d31cf5..1f2ddf00799b 100644
--- a/drivers/dma-buf/sw_sync.c
+++ b/drivers/dma-buf/sw_sync.c
@@ -311,7 +311,7 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file)
struct sync_timeline *obj;
char task_comm[TASK_COMM_LEN];
- get_task_comm(task_comm, current);
+ strscpy_pad(task_comm, current->comm);
obj = sync_timeline_create(task_comm);
if (!obj)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
index 1ef758ac5076..ea2b99fde425 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
@@ -73,7 +73,7 @@ struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,
/* This reference gets released in amdkfd_fence_release */
mmgrab(mm);
fence->mm = mm;
- get_task_comm(fence->timeline_name, current);
+ strscpy_pad(fence->timeline_name, current->comm);
spin_lock_init(&fence->lock);
fence->svm_bo = svm_bo;
dma_fence_init(&fence->base, &amdkfd_fence_ops, &fence->lock,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
index 23d7d0b0d625..3e2ad72cafc4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
@@ -166,7 +166,7 @@ amdgpu_eviction_fence_create(struct amdgpu_eviction_fence_mgr *evf_mgr)
return NULL;
ev_fence->evf_mgr = evf_mgr;
- get_task_comm(ev_fence->timeline_name, current);
+ strscpy_pad(ev_fence->timeline_name, current->comm);
spin_lock_init(&ev_fence->lock);
dma_fence_init64(&ev_fence->base, &amdgpu_eviction_fence_ops,
&ev_fence->lock, evf_mgr->ev_fence_ctx,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 25bade9a5e95..8a4a4c03bbcd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -4169,7 +4169,7 @@ int amdgpu_ras_init(struct amdgpu_device *adev)
}
con->init_task_pid = task_pid_nr(current);
- get_task_comm(con->init_task_comm, current);
+ strscpy_pad(con->init_task_comm, current->comm);
mutex_init(&con->critical_region_lock);
INIT_LIST_HEAD(&con->critical_region_head);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index c2a983ff23c9..73aa37f65e0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -92,7 +92,7 @@ int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev,
fence_drv->adev = adev;
fence_drv->context = dma_fence_context_alloc(1);
- get_task_comm(fence_drv->timeline_name, current);
+ strscpy_pad(fence_drv->timeline_name, current->comm);
xa_lock_irqsave(&adev->userq_xa, flags);
r = xa_err(__xa_store(&adev->userq_xa, userq->doorbell_index,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 39b4250ede0f..83b5d5f5775c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2516,13 +2516,13 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)
return;
vm->task_info->task.pid = current->pid;
- get_task_comm(vm->task_info->task.comm, current);
+ strscpy_pad(vm->task_info->task.comm, current->comm);
if (current->group_leader->mm != current->mm)
return;
vm->task_info->tgid = current->group_leader->pid;
- get_task_comm(vm->task_info->process_name, current->group_leader);
+ strscpy_pad(vm->task_info->process_name, current->group_leader->comm);
}
/**
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 77ce9cf28051..7e2f0d28b7ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -598,7 +598,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
}
vres->task.pid = task_pid_nr(current);
- get_task_comm(vres->task.comm, current);
+ strscpy_pad(vres->task.comm, current->comm);
list_add_tail(&vres->vres_node, &mgr->allocated_vres_list);
if (bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS && adjust_dcc_size) {
diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
index 0e668fc1e0f9..7536288ec93b 100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@ -29,7 +29,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
goto err_out0;
ctx->pid = task_pid_nr(current);
- get_task_comm(ctx->pname, current);
+ strscpy_pad(ctx->pname, current->comm);
return 0;
diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
index bb73f2a68a12..b6575fc43ee4 100644
--- a/drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
@@ -17,7 +17,7 @@ static void panfrost_gem_debugfs_bo_add(struct panfrost_device *pfdev,
struct panfrost_gem_object *bo)
{
bo->debugfs.creator.tgid = current->group_leader->pid;
- get_task_comm(bo->debugfs.creator.process_name, current->group_leader);
+ strscpy_pad(bo->debugfs.creator.process_name, current->group_leader->comm);
mutex_lock(&pfdev->debugfs.gems_lock);
list_add_tail(&bo->debugfs.node, &pfdev->debugfs.gems_list);
diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c
index a123bc740ba1..ba2b80c760c9 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.c
+++ b/drivers/gpu/drm/panthor/panthor_gem.c
@@ -27,7 +27,7 @@ static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo)
struct panthor_device, base);
bo->debugfs.creator.tgid = current->group_leader->pid;
- get_task_comm(bo->debugfs.creator.process_name, current->group_leader);
+ strscpy_pad(bo->debugfs.creator.process_name, current->group_leader->comm);
mutex_lock(&ptdev->gems.lock);
list_add_tail(&bo->debugfs.node, &ptdev->gems.node);
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index c33c057365f8..d2bf221e8f01 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -50,7 +50,7 @@ static void virtio_gpu_create_context_locked(struct virtio_gpu_device *vgdev,
} else {
char dbgname[TASK_COMM_LEN];
- get_task_comm(dbgname, current);
+ strscpy_pad(dbgname, current->comm);
virtio_gpu_cmd_context_create(vgdev, vfpriv->ctx_id,
vfpriv->context_init, strlen(dbgname),
dbgname);
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index cdba4e875b28..f07784c8751c 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -634,7 +634,7 @@ static ssize_t stm_char_write(struct file *file, const char __user *buf,
char comm[sizeof(current->comm)];
char *ids[] = { comm, "default", NULL };
- get_task_comm(comm, current);
+ strscpy_pad(comm, current->comm);
err = stm_assign_first_policy(stmf->stm, &stmf->output, ids, 1);
/*
diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 75542333c54a..2724341edda0 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -77,7 +77,7 @@ static void tty_audit_log(const char *description, dev_t dev,
audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u major=%d minor=%d comm=",
description, pid, uid, loginuid, sessionid,
MAJOR(dev), MINOR(dev));
- get_task_comm(name, current);
+ strscpy_pad(name, current->comm);
audit_log_untrustedstring(ab, name);
audit_log_format(ab, " data=");
audit_log_n_hex(ab, data, size);
diff --git a/fs/bcachefs/thread_with_file.c b/fs/bcachefs/thread_with_file.c
index c2eae0ab7765..eda1b6b5e3b7 100644
--- a/fs/bcachefs/thread_with_file.c
+++ b/fs/bcachefs/thread_with_file.c
@@ -35,7 +35,7 @@ int bch2_run_thread_with_file(struct thread_with_file *thr,
fd_flags |= O_WRONLY;
char name[TASK_COMM_LEN];
- get_task_comm(name, current);
+ strscpy_pad(name, current->comm);
thr->ret = 0;
thr->task = kthread_create(fn, thr, "%s", name);
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 264fba0d44bd..6ea946656403 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1540,7 +1540,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
SET_UID(psinfo->pr_uid, from_kuid_munged(cred->user_ns, cred->uid));
SET_GID(psinfo->pr_gid, from_kgid_munged(cred->user_ns, cred->gid));
rcu_read_unlock();
- get_task_comm(psinfo->pr_fname, p);
+ strscpy_pad(psinfo->pr_fname, p->comm);
return 0;
}
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 48fd2de3bca0..605d09d3c36f 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1365,7 +1365,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
SET_UID(psinfo->pr_uid, from_kuid_munged(cred->user_ns, cred->uid));
SET_GID(psinfo->pr_gid, from_kgid_munged(cred->user_ns, cred->gid));
rcu_read_unlock();
- get_task_comm(psinfo->pr_fname, p);
+ strscpy_pad(psinfo->pr_fname, p->comm);
return 0;
}
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index bc27301eab6d..ab94ab55111e 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -122,7 +122,6 @@ static int nst_seq_show(struct seq_file *seq, void *v)
send = ktime_to_us(ktime_sub(now, nst->st_send_time));
status = ktime_to_us(ktime_sub(now, nst->st_status_time));
- /* get_task_comm isn't exported. oh well. */
seq_printf(seq, "%p:\n"
" pid: %lu\n"
" tgid: %lu\n"
diff --git a/fs/proc/array.c b/fs/proc/array.c
index d6a0369caa93..c65a4c2994c2 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -109,7 +109,7 @@ void proc_task_name(struct seq_file *m, struct task_struct *p, bool escape)
else if (p->flags & PF_KTHREAD)
get_kthread_comm(tcomm, sizeof(tcomm), p);
else
- get_task_comm(tcomm, p);
+ strscpy_pad(tcomm, p->comm);
if (escape)
seq_escape_str(m, tcomm, ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 87e9dfaf61ac..97ea2ac2a97a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1966,25 +1966,6 @@ extern void __set_task_comm(struct task_struct *tsk, const char *from, bool exec
__set_task_comm(tsk, from, false); \
})
-/*
- * - Why not use task_lock()?
- * User space can randomly change their names anyway, so locking for readers
- * doesn't make sense. For writers, locking is probably necessary, as a race
- * condition could lead to long-term mixed results.
- * The logic inside __set_task_comm() should ensure that the task comm is
- * always NUL-terminated and zero-padded. Therefore the race condition between
- * reader and writer is not an issue.
- *
- * - BUILD_BUG_ON() can help prevent the buf from being truncated.
- * Since the callers don't perform any return value checks, this safeguard is
- * necessary.
- */
-#define get_task_comm(buf, tsk) ({ \
- BUILD_BUG_ON(sizeof(buf) < TASK_COMM_LEN); \
- strscpy_pad(buf, (tsk)->comm); \
- buf; \
-})
-
static __always_inline void scheduler_ipi(void)
{
/*
diff --git a/kernel/audit.c b/kernel/audit.c
index 61b5744d0bb6..64623f186fc6 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1621,7 +1621,8 @@ static void audit_log_multicast(int group, const char *op, int err)
audit_put_tty(tty);
audit_log_task_context(ab); /* subj= */
audit_log_format(ab, " comm=");
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ strscpy_pad(comm, current->comm);
+ audit_log_untrustedstring(ab, comm);
audit_log_d_path_exe(ab, current->mm); /* exe= */
audit_log_format(ab, " nl-mcgrp=%d op=%s res=%d", group, op, !err);
audit_log_end(ab);
@@ -2270,7 +2271,8 @@ void audit_log_task_info(struct audit_buffer *ab)
audit_get_sessionid(current));
audit_put_tty(tty);
audit_log_format(ab, " comm=");
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ strscpy_pad(comm, current->comm);
+ audit_log_untrustedstring(ab, comm);
audit_log_d_path_exe(ab, current->mm);
audit_log_task_context(ab);
}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index eb98cd6fe91f..67a132114329 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2930,7 +2930,8 @@ void __audit_log_nfcfg(const char *name, u8 af, unsigned int nentries,
audit_log_format(ab, " pid=%u", task_tgid_nr(current));
audit_log_task_context(ab); /* subj= */
audit_log_format(ab, " comm=");
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ strscpy_pad(comm, current->comm);
+ audit_log_untrustedstring(ab, comm);
audit_log_end(ab);
}
EXPORT_SYMBOL_GPL(__audit_log_nfcfg);
@@ -2953,7 +2954,8 @@ static void audit_log_task(struct audit_buffer *ab)
sessionid);
audit_log_task_context(ab);
audit_log_format(ab, " pid=%d comm=", task_tgid_nr(current));
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ strscpy_pad(comm, current->comm);
+ audit_log_untrustedstring(ab, comm);
audit_log_d_path_exe(ab, current->mm);
}
diff --git a/kernel/sys.c b/kernel/sys.c
index 0d5d27cb9cbe..cb5cce753e71 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2535,7 +2535,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
proc_comm_connector(me);
break;
case PR_GET_NAME:
- get_task_comm(comm, me);
+ strscpy_pad(comm, me->comm);
if (copy_to_user((char __user *)arg2, comm, sizeof(comm)))
return -EFAULT;
break;
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 84265983f239..42e67c03cb7d 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -682,12 +682,6 @@ static struct kmemleak_object *__alloc_object(gfp_t gfp)
strscpy(object->comm, "softirq");
} else {
object->pid = current->pid;
- /*
- * There is a small chance of a race with set_task_comm(),
- * however using get_task_comm() here may cause locking
- * dependency issues with current->alloc_lock. In the worst
- * case, the command line is not correct.
- */
strscpy(object->comm, current->comm);
}
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index fc866759910d..759a508024be 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -106,7 +106,7 @@ static bool hci_sock_gen_cookie(struct sock *sk)
id = 0xffffffff;
hci_pi(sk)->cookie = id;
- get_task_comm(hci_pi(sk)->comm, current);
+ strscpy_pad(hci_pi(sk)->comm, current->comm);
return true;
}
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 13d0ed9d1895..e3a73ca4e9c3 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -9658,7 +9658,7 @@ static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net,
if (nla_put_be32(skb, NFTA_GEN_ID, htonl(nft_net->base_seq)) ||
nla_put_be32(skb, NFTA_GEN_PROC_PID, htonl(task_pid_nr(current))) ||
- nla_put_string(skb, NFTA_GEN_PROC_NAME, get_task_comm(buf, current)))
+ nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
goto nla_put_failure;
nlmsg_end(skb, nlh);
diff --git a/security/integrity/integrity_audit.c b/security/integrity/integrity_audit.c
index 0ec5e4c22cb2..28c203f0cdb7 100644
--- a/security/integrity/integrity_audit.c
+++ b/security/integrity/integrity_audit.c
@@ -54,7 +54,8 @@ void integrity_audit_message(int audit_msgno, struct inode *inode,
audit_get_sessionid(current));
audit_log_task_context(ab);
audit_log_format(ab, " op=%s cause=%s comm=", op, cause);
- audit_log_untrustedstring(ab, get_task_comm(name, current));
+ strscpy_pad(name, current->comm);
+ audit_log_untrustedstring(ab, name);
if (fname) {
audit_log_format(ab, " name=");
audit_log_untrustedstring(ab, fname);
diff --git a/security/ipe/audit.c b/security/ipe/audit.c
index de5fed62592e..b4318988c65d 100644
--- a/security/ipe/audit.c
+++ b/security/ipe/audit.c
@@ -144,7 +144,7 @@ void ipe_audit_match(const struct ipe_eval_ctx *const ctx,
audit_log_format(ab, "ipe_op=%s ipe_hook=%s enforcing=%d pid=%d comm=",
op, audit_hook_names[ctx->hook], READ_ONCE(enforce),
task_tgid_nr(current));
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ audit_log_untrustedstring(ab, strscpy_pad(comm, current->comm));
if (ctx->file) {
audit_log_d_path(ab, " path=", &ctx->file->f_path);
diff --git a/security/landlock/domain.c b/security/landlock/domain.c
index a647b68e8d06..77b678f0f469 100644
--- a/security/landlock/domain.c
+++ b/security/landlock/domain.c
@@ -102,7 +102,7 @@ static struct landlock_details *get_current_details(void)
memcpy(details->exe_path, path_str, path_size);
details->pid = get_pid(task_tgid(current));
details->uid = from_kuid(&init_user_ns, current_uid());
- get_task_comm(details->comm, current);
+ strscpy_pad(details->comm, current->comm);
return details;
}
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 7d623b00495c..b4d3b8a69cfe 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -276,8 +276,8 @@ void audit_log_lsm_data(struct audit_buffer *ab,
if (pid) {
char tskcomm[sizeof(tsk->comm)];
audit_log_format(ab, " opid=%d ocomm=", pid);
- audit_log_untrustedstring(ab,
- get_task_comm(tskcomm, tsk));
+ strscpy_pad(tskcomm, tsk->comm);
+ audit_log_untrustedstring(ab, tskcomm);
}
}
break;
@@ -417,7 +417,8 @@ static void dump_common_audit_data(struct audit_buffer *ab,
char comm[sizeof(current->comm)];
audit_log_format(ab, " pid=%d comm=", task_tgid_nr(current));
- audit_log_untrustedstring(ab, get_task_comm(comm, current));
+ strscpy_pad(comm, current->comm);
+ audit_log_untrustedstring(ab, comm);
audit_log_lsm_data(ab, a);
}
--
2.38.1Hi Bhupesh,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20250808]
[cannot apply to trace/for-next tip/sched/core brauner-vfs/vfs.all linus/master v6.17-rc1 v6.16 v6.16-rc7 v6.17-rc1]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bhupesh/exec-Remove-obsolete-comments/20250811-144920
base: next-20250808
patch link: https://lore.kernel.org/r/20250811064609.918593-4-bhupesh%40igalia.com
patch subject: [PATCH v7 3/4] treewide: Replace 'get_task_comm()' with 'strscpy_pad()'
config: arc-randconfig-002-20250812 (https://download.01.org/0day-ci/archive/20250812/202508121145.d07aFegg-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 12.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250812/202508121145.d07aFegg-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202508121145.d07aFegg-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from include/linux/build_bug.h:5,
from include/linux/container_of.h:5,
from include/linux/list.h:5,
from include/linux/module.h:12,
from net/netfilter/nf_tables_api.c:8:
net/netfilter/nf_tables_api.c: In function 'nf_tables_fill_gen_info':
>> include/linux/string.h:116:50: warning: passing argument 3 of 'nla_put_string' makes pointer from integer without a cast [-Wint-conversion]
116 | #define sized_strscpy_pad(dest, src, count) ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~
| |
| ssize_t {aka int}
117 | char *__dst = (dest); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118 | const char *__src = (src); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119 | const size_t __count = (count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120 | ssize_t __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121 | \
| ~
122 | __wrote = sized_strscpy(__dst, __src, __count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123 | if (__wrote >= 0 && __wrote < __count) \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 | memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125 | __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126 | })
| ~~
include/linux/compiler.h:57:52: note: in definition of macro '__trace_if_var'
57 | #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
| ^~~~
net/netfilter/nf_tables_api.c:9659:9: note: in expansion of macro 'if'
9659 | if (nla_put_be32(skb, NFTA_GEN_ID, htonl(nft_net->base_seq)) ||
| ^~
include/linux/string.h:86:9: note: in expansion of macro 'sized_strscpy_pad'
86 | sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
| ^~~~~~~~~~~~~~~~~
include/linux/args.h:25:24: note: in expansion of macro '__strscpy_pad0'
25 | #define __CONCAT(a, b) a ## b
| ^
include/linux/args.h:26:27: note: in expansion of macro '__CONCAT'
26 | #define CONCATENATE(a, b) __CONCAT(a, b)
| ^~~~~~~~
include/linux/string.h:149:9: note: in expansion of macro 'CONCATENATE'
149 | CONCATENATE(__strscpy_pad, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
| ^~~~~~~~~~~
net/netfilter/nf_tables_api.c:9661:53: note: in expansion of macro 'strscpy_pad'
9661 | nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
| ^~~~~~~~~~~
In file included from include/linux/netfilter/nfnetlink.h:7,
from net/netfilter/nf_tables_api.c:17:
include/net/netlink.h:1655:46: note: expected 'const char *' but argument is of type 'ssize_t' {aka 'int'}
1655 | const char *str)
| ~~~~~~~~~~~~^~~
>> include/linux/string.h:116:50: warning: passing argument 3 of 'nla_put_string' makes pointer from integer without a cast [-Wint-conversion]
116 | #define sized_strscpy_pad(dest, src, count) ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~
| |
| ssize_t {aka int}
117 | char *__dst = (dest); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118 | const char *__src = (src); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119 | const size_t __count = (count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120 | ssize_t __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121 | \
| ~
122 | __wrote = sized_strscpy(__dst, __src, __count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123 | if (__wrote >= 0 && __wrote < __count) \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 | memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125 | __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126 | })
| ~~
include/linux/compiler.h:57:61: note: in definition of macro '__trace_if_var'
57 | #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
| ^~~~
net/netfilter/nf_tables_api.c:9659:9: note: in expansion of macro 'if'
9659 | if (nla_put_be32(skb, NFTA_GEN_ID, htonl(nft_net->base_seq)) ||
| ^~
include/linux/string.h:86:9: note: in expansion of macro 'sized_strscpy_pad'
86 | sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
| ^~~~~~~~~~~~~~~~~
include/linux/args.h:25:24: note: in expansion of macro '__strscpy_pad0'
25 | #define __CONCAT(a, b) a ## b
| ^
include/linux/args.h:26:27: note: in expansion of macro '__CONCAT'
26 | #define CONCATENATE(a, b) __CONCAT(a, b)
| ^~~~~~~~
include/linux/string.h:149:9: note: in expansion of macro 'CONCATENATE'
149 | CONCATENATE(__strscpy_pad, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
| ^~~~~~~~~~~
net/netfilter/nf_tables_api.c:9661:53: note: in expansion of macro 'strscpy_pad'
9661 | nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
| ^~~~~~~~~~~
include/net/netlink.h:1655:46: note: expected 'const char *' but argument is of type 'ssize_t' {aka 'int'}
1655 | const char *str)
| ~~~~~~~~~~~~^~~
>> include/linux/string.h:116:50: warning: passing argument 3 of 'nla_put_string' makes pointer from integer without a cast [-Wint-conversion]
116 | #define sized_strscpy_pad(dest, src, count) ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~
| |
| ssize_t {aka int}
117 | char *__dst = (dest); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118 | const char *__src = (src); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119 | const size_t __count = (count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120 | ssize_t __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121 | \
| ~
122 | __wrote = sized_strscpy(__dst, __src, __count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123 | if (__wrote >= 0 && __wrote < __count) \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 | memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125 | __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126 | })
| ~~
include/linux/compiler.h:68:10: note: in definition of macro '__trace_if_value'
68 | (cond) ? \
| ^~~~
include/linux/compiler.h:55:28: note: in expansion of macro '__trace_if_var'
55 | #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) )
| ^~~~~~~~~~~~~~
net/netfilter/nf_tables_api.c:9659:9: note: in expansion of macro 'if'
9659 | if (nla_put_be32(skb, NFTA_GEN_ID, htonl(nft_net->base_seq)) ||
| ^~
include/linux/string.h:86:9: note: in expansion of macro 'sized_strscpy_pad'
86 | sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
| ^~~~~~~~~~~~~~~~~
include/linux/args.h:25:24: note: in expansion of macro '__strscpy_pad0'
25 | #define __CONCAT(a, b) a ## b
| ^
include/linux/args.h:26:27: note: in expansion of macro '__CONCAT'
26 | #define CONCATENATE(a, b) __CONCAT(a, b)
| ^~~~~~~~
include/linux/string.h:149:9: note: in expansion of macro 'CONCATENATE'
149 | CONCATENATE(__strscpy_pad, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
| ^~~~~~~~~~~
net/netfilter/nf_tables_api.c:9661:53: note: in expansion of macro 'strscpy_pad'
9661 | nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
| ^~~~~~~~~~~
include/net/netlink.h:1655:46: note: expected 'const char *' but argument is of type 'ssize_t' {aka 'int'}
1655 | const char *str)
| ~~~~~~~~~~~~^~~
vim +/nla_put_string +116 include/linux/string.h
e6584c3964f2ff Kees Cook 2023-09-20 74
e6584c3964f2ff Kees Cook 2023-09-20 75 /*
e6584c3964f2ff Kees Cook 2023-09-20 76 * The 2 argument style can only be used when dst is an array with a
e6584c3964f2ff Kees Cook 2023-09-20 77 * known size.
e6584c3964f2ff Kees Cook 2023-09-20 78 */
e6584c3964f2ff Kees Cook 2023-09-20 79 #define __strscpy0(dst, src, ...) \
559048d156ff33 Kees Cook 2024-08-05 80 sized_strscpy(dst, src, sizeof(dst) + __must_be_array(dst) + \
559048d156ff33 Kees Cook 2024-08-05 81 __must_be_cstr(dst) + __must_be_cstr(src))
559048d156ff33 Kees Cook 2024-08-05 82 #define __strscpy1(dst, src, size) \
559048d156ff33 Kees Cook 2024-08-05 83 sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
e6584c3964f2ff Kees Cook 2023-09-20 84
8366d124ec937c Kees Cook 2024-02-02 85 #define __strscpy_pad0(dst, src, ...) \
559048d156ff33 Kees Cook 2024-08-05 86 sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
559048d156ff33 Kees Cook 2024-08-05 87 __must_be_cstr(dst) + __must_be_cstr(src))
559048d156ff33 Kees Cook 2024-08-05 88 #define __strscpy_pad1(dst, src, size) \
559048d156ff33 Kees Cook 2024-08-05 89 sized_strscpy_pad(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
458a3bf82df4fe Tobin C. Harding 2019-04-05 90
e6584c3964f2ff Kees Cook 2023-09-20 91 /**
e6584c3964f2ff Kees Cook 2023-09-20 92 * strscpy - Copy a C-string into a sized buffer
e6584c3964f2ff Kees Cook 2023-09-20 93 * @dst: Where to copy the string to
e6584c3964f2ff Kees Cook 2023-09-20 94 * @src: Where to copy the string from
e6584c3964f2ff Kees Cook 2023-09-20 95 * @...: Size of destination buffer (optional)
e6584c3964f2ff Kees Cook 2023-09-20 96 *
e6584c3964f2ff Kees Cook 2023-09-20 97 * Copy the source string @src, or as much of it as fits, into the
e6584c3964f2ff Kees Cook 2023-09-20 98 * destination @dst buffer. The behavior is undefined if the string
e6584c3964f2ff Kees Cook 2023-09-20 99 * buffers overlap. The destination @dst buffer is always NUL terminated,
e6584c3964f2ff Kees Cook 2023-09-20 100 * unless it's zero-sized.
e6584c3964f2ff Kees Cook 2023-09-20 101 *
e6584c3964f2ff Kees Cook 2023-09-20 102 * The size argument @... is only required when @dst is not an array, or
e6584c3964f2ff Kees Cook 2023-09-20 103 * when the copy needs to be smaller than sizeof(@dst).
e6584c3964f2ff Kees Cook 2023-09-20 104 *
e6584c3964f2ff Kees Cook 2023-09-20 105 * Preferred to strncpy() since it always returns a valid string, and
e6584c3964f2ff Kees Cook 2023-09-20 106 * doesn't unnecessarily force the tail of the destination buffer to be
e6584c3964f2ff Kees Cook 2023-09-20 107 * zero padded. If padding is desired please use strscpy_pad().
e6584c3964f2ff Kees Cook 2023-09-20 108 *
e6584c3964f2ff Kees Cook 2023-09-20 109 * Returns the number of characters copied in @dst (not including the
e6584c3964f2ff Kees Cook 2023-09-20 110 * trailing %NUL) or -E2BIG if @size is 0 or the copy from @src was
e6584c3964f2ff Kees Cook 2023-09-20 111 * truncated.
e6584c3964f2ff Kees Cook 2023-09-20 112 */
e6584c3964f2ff Kees Cook 2023-09-20 113 #define strscpy(dst, src, ...) \
e6584c3964f2ff Kees Cook 2023-09-20 114 CONCATENATE(__strscpy, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
458a3bf82df4fe Tobin C. Harding 2019-04-05 115
8366d124ec937c Kees Cook 2024-02-02 @116 #define sized_strscpy_pad(dest, src, count) ({ \
8366d124ec937c Kees Cook 2024-02-02 117 char *__dst = (dest); \
8366d124ec937c Kees Cook 2024-02-02 118 const char *__src = (src); \
8366d124ec937c Kees Cook 2024-02-02 119 const size_t __count = (count); \
8366d124ec937c Kees Cook 2024-02-02 120 ssize_t __wrote; \
8366d124ec937c Kees Cook 2024-02-02 121 \
8366d124ec937c Kees Cook 2024-02-02 122 __wrote = sized_strscpy(__dst, __src, __count); \
8366d124ec937c Kees Cook 2024-02-02 123 if (__wrote >= 0 && __wrote < __count) \
8366d124ec937c Kees Cook 2024-02-02 124 memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
8366d124ec937c Kees Cook 2024-02-02 125 __wrote; \
8366d124ec937c Kees Cook 2024-02-02 126 })
8366d124ec937c Kees Cook 2024-02-02 127
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Mon, Aug 11, 2025 at 12:16:08PM +0530, Bhupesh wrote: > As Linus mentioned in [1], we should get rid of 'get_task_comm()' > entirely and replace it with 'strscpy_pad()' implementation. > > 'strscpy_pad()' will already make sure comm is NUL-terminated, so > we won't need the explicit final byte termination done in > 'get_task_comm()'. > > The relevant 'get_task_comm()' users were identified using the > following search pattern: > $ git grep 'get_task_comm*' > [1]. https://lore.kernel.org/all/CAHk-=wi5c=_-FBGo_88CowJd_F-Gi6Ud9d=TALm65ReN7YjrMw@mail.gmail.com/ > > Signed-off-by: Bhupesh <bhupesh@igalia.com> Make that a Link tag? Link: https://lore.kernel.org/all/CAHk-=wi5c=_-FBGo_88CowJd_F-Gi6Ud9d=TALm65ReN7YjrMw@mail.gmail.com/ #1 Signed-off-by: Bhupesh <bhupesh@igalia.com> -- With Best Regards, Andy Shevchenko
On 8/11/25 8:35 PM, Andy Shevchenko wrote: > On Mon, Aug 11, 2025 at 12:16:08PM +0530, Bhupesh wrote: >> As Linus mentioned in [1], we should get rid of 'get_task_comm()' >> entirely and replace it with 'strscpy_pad()' implementation. >> >> 'strscpy_pad()' will already make sure comm is NUL-terminated, so >> we won't need the explicit final byte termination done in >> 'get_task_comm()'. >> >> The relevant 'get_task_comm()' users were identified using the >> following search pattern: >> $ git grep 'get_task_comm*' >> [1]. https://lore.kernel.org/all/CAHk-=wi5c=_-FBGo_88CowJd_F-Gi6Ud9d=TALm65ReN7YjrMw@mail.gmail.com/ >> >> Signed-off-by: Bhupesh <bhupesh@igalia.com> > Make that a Link tag? > > Link: https://lore.kernel.org/all/CAHk-=wi5c=_-FBGo_88CowJd_F-Gi6Ud9d=TALm65ReN7YjrMw@mail.gmail.com/ #1 > Signed-off-by: Bhupesh <bhupesh@igalia.com> > Sure, will include it in next version. Waiting for further reviews on this v7. Thanks.
Hi Bhupesh,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20250808]
[cannot apply to trace/for-next tip/sched/core brauner-vfs/vfs.all linus/master v6.17-rc1 v6.16 v6.16-rc7 v6.17-rc1]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bhupesh/exec-Remove-obsolete-comments/20250811-144920
base: next-20250808
patch link: https://lore.kernel.org/r/20250811064609.918593-4-bhupesh%40igalia.com
patch subject: [PATCH v7 3/4] treewide: Replace 'get_task_comm()' with 'strscpy_pad()'
config: sh-randconfig-002-20250811 (https://download.01.org/0day-ci/archive/20250811/202508111835.JFL8DgKY-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 15.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250811/202508111835.JFL8DgKY-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202508111835.JFL8DgKY-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from include/linux/bitmap.h:13,
from include/linux/cpumask.h:12,
from include/linux/smp.h:13,
from include/linux/lockdep.h:14,
from include/linux/spinlock.h:63,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/umh.h:4,
from include/linux/kmod.h:9,
from include/linux/module.h:18,
from net/netfilter/nf_tables_api.c:8:
net/netfilter/nf_tables_api.c: In function 'nf_tables_fill_gen_info':
>> include/linux/string.h:116:50: error: passing argument 3 of 'nla_put_string' makes pointer from integer without a cast [-Wint-conversion]
116 | #define sized_strscpy_pad(dest, src, count) ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~
| |
| ssize_t {aka int}
117 | char *__dst = (dest); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118 | const char *__src = (src); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119 | const size_t __count = (count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120 | ssize_t __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121 | \
| ~
122 | __wrote = sized_strscpy(__dst, __src, __count); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123 | if (__wrote >= 0 && __wrote < __count) \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 | memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
125 | __wrote; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126 | })
| ~~
include/linux/string.h:86:9: note: in expansion of macro 'sized_strscpy_pad'
86 | sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
| ^~~~~~~~~~~~~~~~~
include/linux/args.h:25:24: note: in expansion of macro '__strscpy_pad0'
25 | #define __CONCAT(a, b) a ## b
| ^
include/linux/args.h:26:27: note: in expansion of macro '__CONCAT'
26 | #define CONCATENATE(a, b) __CONCAT(a, b)
| ^~~~~~~~
include/linux/string.h:149:9: note: in expansion of macro 'CONCATENATE'
149 | CONCATENATE(__strscpy_pad, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
| ^~~~~~~~~~~
net/netfilter/nf_tables_api.c:9661:53: note: in expansion of macro 'strscpy_pad'
9661 | nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
| ^~~~~~~~~~~
In file included from include/linux/netfilter/nfnetlink.h:7,
from net/netfilter/nf_tables_api.c:17:
include/net/netlink.h:1655:46: note: expected 'const char *' but argument is of type 'ssize_t' {aka 'int'}
1655 | const char *str)
| ~~~~~~~~~~~~^~~
vim +/nla_put_string +116 include/linux/string.h
e6584c3964f2ff Kees Cook 2023-09-20 74
e6584c3964f2ff Kees Cook 2023-09-20 75 /*
e6584c3964f2ff Kees Cook 2023-09-20 76 * The 2 argument style can only be used when dst is an array with a
e6584c3964f2ff Kees Cook 2023-09-20 77 * known size.
e6584c3964f2ff Kees Cook 2023-09-20 78 */
e6584c3964f2ff Kees Cook 2023-09-20 79 #define __strscpy0(dst, src, ...) \
559048d156ff33 Kees Cook 2024-08-05 80 sized_strscpy(dst, src, sizeof(dst) + __must_be_array(dst) + \
559048d156ff33 Kees Cook 2024-08-05 81 __must_be_cstr(dst) + __must_be_cstr(src))
559048d156ff33 Kees Cook 2024-08-05 82 #define __strscpy1(dst, src, size) \
559048d156ff33 Kees Cook 2024-08-05 83 sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
e6584c3964f2ff Kees Cook 2023-09-20 84
8366d124ec937c Kees Cook 2024-02-02 85 #define __strscpy_pad0(dst, src, ...) \
559048d156ff33 Kees Cook 2024-08-05 86 sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
559048d156ff33 Kees Cook 2024-08-05 87 __must_be_cstr(dst) + __must_be_cstr(src))
559048d156ff33 Kees Cook 2024-08-05 88 #define __strscpy_pad1(dst, src, size) \
559048d156ff33 Kees Cook 2024-08-05 89 sized_strscpy_pad(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
458a3bf82df4fe Tobin C. Harding 2019-04-05 90
e6584c3964f2ff Kees Cook 2023-09-20 91 /**
e6584c3964f2ff Kees Cook 2023-09-20 92 * strscpy - Copy a C-string into a sized buffer
e6584c3964f2ff Kees Cook 2023-09-20 93 * @dst: Where to copy the string to
e6584c3964f2ff Kees Cook 2023-09-20 94 * @src: Where to copy the string from
e6584c3964f2ff Kees Cook 2023-09-20 95 * @...: Size of destination buffer (optional)
e6584c3964f2ff Kees Cook 2023-09-20 96 *
e6584c3964f2ff Kees Cook 2023-09-20 97 * Copy the source string @src, or as much of it as fits, into the
e6584c3964f2ff Kees Cook 2023-09-20 98 * destination @dst buffer. The behavior is undefined if the string
e6584c3964f2ff Kees Cook 2023-09-20 99 * buffers overlap. The destination @dst buffer is always NUL terminated,
e6584c3964f2ff Kees Cook 2023-09-20 100 * unless it's zero-sized.
e6584c3964f2ff Kees Cook 2023-09-20 101 *
e6584c3964f2ff Kees Cook 2023-09-20 102 * The size argument @... is only required when @dst is not an array, or
e6584c3964f2ff Kees Cook 2023-09-20 103 * when the copy needs to be smaller than sizeof(@dst).
e6584c3964f2ff Kees Cook 2023-09-20 104 *
e6584c3964f2ff Kees Cook 2023-09-20 105 * Preferred to strncpy() since it always returns a valid string, and
e6584c3964f2ff Kees Cook 2023-09-20 106 * doesn't unnecessarily force the tail of the destination buffer to be
e6584c3964f2ff Kees Cook 2023-09-20 107 * zero padded. If padding is desired please use strscpy_pad().
e6584c3964f2ff Kees Cook 2023-09-20 108 *
e6584c3964f2ff Kees Cook 2023-09-20 109 * Returns the number of characters copied in @dst (not including the
e6584c3964f2ff Kees Cook 2023-09-20 110 * trailing %NUL) or -E2BIG if @size is 0 or the copy from @src was
e6584c3964f2ff Kees Cook 2023-09-20 111 * truncated.
e6584c3964f2ff Kees Cook 2023-09-20 112 */
e6584c3964f2ff Kees Cook 2023-09-20 113 #define strscpy(dst, src, ...) \
e6584c3964f2ff Kees Cook 2023-09-20 114 CONCATENATE(__strscpy, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
458a3bf82df4fe Tobin C. Harding 2019-04-05 115
8366d124ec937c Kees Cook 2024-02-02 @116 #define sized_strscpy_pad(dest, src, count) ({ \
8366d124ec937c Kees Cook 2024-02-02 117 char *__dst = (dest); \
8366d124ec937c Kees Cook 2024-02-02 118 const char *__src = (src); \
8366d124ec937c Kees Cook 2024-02-02 119 const size_t __count = (count); \
8366d124ec937c Kees Cook 2024-02-02 120 ssize_t __wrote; \
8366d124ec937c Kees Cook 2024-02-02 121 \
8366d124ec937c Kees Cook 2024-02-02 122 __wrote = sized_strscpy(__dst, __src, __count); \
8366d124ec937c Kees Cook 2024-02-02 123 if (__wrote >= 0 && __wrote < __count) \
8366d124ec937c Kees Cook 2024-02-02 124 memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
8366d124ec937c Kees Cook 2024-02-02 125 __wrote; \
8366d124ec937c Kees Cook 2024-02-02 126 })
8366d124ec937c Kees Cook 2024-02-02 127
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi,
On 8/11/25 4:55 PM, kernel test robot wrote:
> Hi Bhupesh,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on next-20250808]
> [cannot apply to trace/for-next tip/sched/core brauner-vfs/vfs.all linus/master v6.17-rc1 v6.16 v6.16-rc7 v6.17-rc1]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Bhupesh/exec-Remove-obsolete-comments/20250811-144920
> base: next-20250808
> patch link: https://lore.kernel.org/r/20250811064609.918593-4-bhupesh%40igalia.com
> patch subject: [PATCH v7 3/4] treewide: Replace 'get_task_comm()' with 'strscpy_pad()'
> config: sh-randconfig-002-20250811 (https://download.01.org/0day-ci/archive/20250811/202508111835.JFL8DgKY-lkp@intel.com/config)
> compiler: sh4-linux-gcc (GCC) 15.1.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250811/202508111835.JFL8DgKY-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202508111835.JFL8DgKY-lkp@intel.com/
>
> All errors (new ones prefixed by >>):
>
> In file included from include/linux/bitmap.h:13,
> from include/linux/cpumask.h:12,
> from include/linux/smp.h:13,
> from include/linux/lockdep.h:14,
> from include/linux/spinlock.h:63,
> from include/linux/mmzone.h:8,
> from include/linux/gfp.h:7,
> from include/linux/umh.h:4,
> from include/linux/kmod.h:9,
> from include/linux/module.h:18,
> from net/netfilter/nf_tables_api.c:8:
> net/netfilter/nf_tables_api.c: In function 'nf_tables_fill_gen_info':
>>> include/linux/string.h:116:50: error: passing argument 3 of 'nla_put_string' makes pointer from integer without a cast [-Wint-conversion]
> 116 | #define sized_strscpy_pad(dest, src, count) ({ \
> | ~^~~~~~~~~~~~~~~~~~~~~~~~
> | |
> | ssize_t {aka int}
> 117 | char *__dst = (dest); \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 118 | const char *__src = (src); \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 119 | const size_t __count = (count); \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 120 | ssize_t __wrote; \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 121 | \
> | ~
> 122 | __wrote = sized_strscpy(__dst, __src, __count); \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 123 | if (__wrote >= 0 && __wrote < __count) \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 124 | memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 125 | __wrote; \
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 126 | })
> | ~~
> include/linux/string.h:86:9: note: in expansion of macro 'sized_strscpy_pad'
> 86 | sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
> | ^~~~~~~~~~~~~~~~~
> include/linux/args.h:25:24: note: in expansion of macro '__strscpy_pad0'
> 25 | #define __CONCAT(a, b) a ## b
> | ^
> include/linux/args.h:26:27: note: in expansion of macro '__CONCAT'
> 26 | #define CONCATENATE(a, b) __CONCAT(a, b)
> | ^~~~~~~~
> include/linux/string.h:149:9: note: in expansion of macro 'CONCATENATE'
> 149 | CONCATENATE(__strscpy_pad, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
> | ^~~~~~~~~~~
> net/netfilter/nf_tables_api.c:9661:53: note: in expansion of macro 'strscpy_pad'
> 9661 | nla_put_string(skb, NFTA_GEN_PROC_NAME, strscpy_pad(buf, current->comm)))
> | ^~~~~~~~~~~
> In file included from include/linux/netfilter/nfnetlink.h:7,
> from net/netfilter/nf_tables_api.c:17:
> include/net/netlink.h:1655:46: note: expected 'const char *' but argument is of type 'ssize_t' {aka 'int'}
> 1655 | const char *str)
> | ~~~~~~~~~~~~^~~
>
>
> vim +/nla_put_string +116 include/linux/string.h
>
> e6584c3964f2ff Kees Cook 2023-09-20 74
> e6584c3964f2ff Kees Cook 2023-09-20 75 /*
> e6584c3964f2ff Kees Cook 2023-09-20 76 * The 2 argument style can only be used when dst is an array with a
> e6584c3964f2ff Kees Cook 2023-09-20 77 * known size.
> e6584c3964f2ff Kees Cook 2023-09-20 78 */
> e6584c3964f2ff Kees Cook 2023-09-20 79 #define __strscpy0(dst, src, ...) \
> 559048d156ff33 Kees Cook 2024-08-05 80 sized_strscpy(dst, src, sizeof(dst) + __must_be_array(dst) + \
> 559048d156ff33 Kees Cook 2024-08-05 81 __must_be_cstr(dst) + __must_be_cstr(src))
> 559048d156ff33 Kees Cook 2024-08-05 82 #define __strscpy1(dst, src, size) \
> 559048d156ff33 Kees Cook 2024-08-05 83 sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
> e6584c3964f2ff Kees Cook 2023-09-20 84
> 8366d124ec937c Kees Cook 2024-02-02 85 #define __strscpy_pad0(dst, src, ...) \
> 559048d156ff33 Kees Cook 2024-08-05 86 sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) + \
> 559048d156ff33 Kees Cook 2024-08-05 87 __must_be_cstr(dst) + __must_be_cstr(src))
> 559048d156ff33 Kees Cook 2024-08-05 88 #define __strscpy_pad1(dst, src, size) \
> 559048d156ff33 Kees Cook 2024-08-05 89 sized_strscpy_pad(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
> 458a3bf82df4fe Tobin C. Harding 2019-04-05 90
> e6584c3964f2ff Kees Cook 2023-09-20 91 /**
> e6584c3964f2ff Kees Cook 2023-09-20 92 * strscpy - Copy a C-string into a sized buffer
> e6584c3964f2ff Kees Cook 2023-09-20 93 * @dst: Where to copy the string to
> e6584c3964f2ff Kees Cook 2023-09-20 94 * @src: Where to copy the string from
> e6584c3964f2ff Kees Cook 2023-09-20 95 * @...: Size of destination buffer (optional)
> e6584c3964f2ff Kees Cook 2023-09-20 96 *
> e6584c3964f2ff Kees Cook 2023-09-20 97 * Copy the source string @src, or as much of it as fits, into the
> e6584c3964f2ff Kees Cook 2023-09-20 98 * destination @dst buffer. The behavior is undefined if the string
> e6584c3964f2ff Kees Cook 2023-09-20 99 * buffers overlap. The destination @dst buffer is always NUL terminated,
> e6584c3964f2ff Kees Cook 2023-09-20 100 * unless it's zero-sized.
> e6584c3964f2ff Kees Cook 2023-09-20 101 *
> e6584c3964f2ff Kees Cook 2023-09-20 102 * The size argument @... is only required when @dst is not an array, or
> e6584c3964f2ff Kees Cook 2023-09-20 103 * when the copy needs to be smaller than sizeof(@dst).
> e6584c3964f2ff Kees Cook 2023-09-20 104 *
> e6584c3964f2ff Kees Cook 2023-09-20 105 * Preferred to strncpy() since it always returns a valid string, and
> e6584c3964f2ff Kees Cook 2023-09-20 106 * doesn't unnecessarily force the tail of the destination buffer to be
> e6584c3964f2ff Kees Cook 2023-09-20 107 * zero padded. If padding is desired please use strscpy_pad().
> e6584c3964f2ff Kees Cook 2023-09-20 108 *
> e6584c3964f2ff Kees Cook 2023-09-20 109 * Returns the number of characters copied in @dst (not including the
> e6584c3964f2ff Kees Cook 2023-09-20 110 * trailing %NUL) or -E2BIG if @size is 0 or the copy from @src was
> e6584c3964f2ff Kees Cook 2023-09-20 111 * truncated.
> e6584c3964f2ff Kees Cook 2023-09-20 112 */
> e6584c3964f2ff Kees Cook 2023-09-20 113 #define strscpy(dst, src, ...) \
> e6584c3964f2ff Kees Cook 2023-09-20 114 CONCATENATE(__strscpy, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
> 458a3bf82df4fe Tobin C. Harding 2019-04-05 115
> 8366d124ec937c Kees Cook 2024-02-02 @116 #define sized_strscpy_pad(dest, src, count) ({ \
> 8366d124ec937c Kees Cook 2024-02-02 117 char *__dst = (dest); \
> 8366d124ec937c Kees Cook 2024-02-02 118 const char *__src = (src); \
> 8366d124ec937c Kees Cook 2024-02-02 119 const size_t __count = (count); \
> 8366d124ec937c Kees Cook 2024-02-02 120 ssize_t __wrote; \
> 8366d124ec937c Kees Cook 2024-02-02 121 \
> 8366d124ec937c Kees Cook 2024-02-02 122 __wrote = sized_strscpy(__dst, __src, __count); \
> 8366d124ec937c Kees Cook 2024-02-02 123 if (__wrote >= 0 && __wrote < __count) \
> 8366d124ec937c Kees Cook 2024-02-02 124 memset(__dst + __wrote + 1, 0, __count - __wrote - 1); \
> 8366d124ec937c Kees Cook 2024-02-02 125 __wrote; \
> 8366d124ec937c Kees Cook 2024-02-02 126 })
> 8366d124ec937c Kees Cook 2024-02-02 127
>
As mentioned in the accompanying cover letter, this patchset is based on
'linux-next/master' (the exact sha-id used for rebase is:
b1549501188cc9eba732c25b033df7a53ccc341f ).
Thanks,
Bhupesh
On Mon, Aug 11, 2025 at 08:19:08PM +0530, Bhupesh Sharma wrote: > On 8/11/25 4:55 PM, kernel test robot wrote: > As mentioned in the accompanying cover letter, this patchset is based on > 'linux-next/master' (the exact sha-id used for rebase is: > b1549501188cc9eba732c25b033df7a53ccc341f ). Instead of getting false positive reports and this rather unneeded reply from you, use --base parameter when formatting patch series. It will help all, including CIs and bots. -- With Best Regards, Andy Shevchenko
On 8/11/25 8:28 PM, Andy Shevchenko wrote: > On Mon, Aug 11, 2025 at 08:19:08PM +0530, Bhupesh Sharma wrote: >> On 8/11/25 4:55 PM, kernel test robot wrote: >> As mentioned in the accompanying cover letter, this patchset is based on >> 'linux-next/master' (the exact sha-id used for rebase is: >> b1549501188cc9eba732c25b033df7a53ccc341f ). > Instead of getting false positive reports and this rather unneeded reply from > you, use --base parameter when formatting patch series. It will help all, > including CIs and bots. > Sure, will include it in next version. Waiting for further reviews on this v7. Thanks.
© 2016 - 2025 Red Hat, Inc.