1From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sat, 17 Feb 2024 17:52:45 +0100
4Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv()
5
6Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.)
7broke the build on C libraries that miss process_vm_readv(), like
8uClibc-ng.
9
10Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV,
11but is then re-assigned and used a few lines below, outside any guard.
12
13Fix that by always declaring the object, as it is always needed.
14
15Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
16Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c
17---
18 src/exec_ptrace.c | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c
22index 9dd36c275..3d44b82e2 100644
23--- a/src/exec_ptrace.c
24+++ b/src/exec_ptrace.c
25@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec,
26     unsigned long addr, unsigned long strtab)
27 {
28     const unsigned long strtab0 = strtab;
29+    ssize_t nwritten;
30     size_t i;
31     debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC);
32
33 #ifdef HAVE_PROCESS_VM_READV
34-    ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab);
35+    nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab);
36     if (nwritten != -1 || errno != ENOSYS)
37 	debug_return_ssize_t(nwritten);
38 #endif /* HAVE_PROCESS_VM_READV */
39--
402.43.0
41
42