From: Rafael Passos <rafael@rcpassos.me>
Date: Sat, 15 Jun 2024 02:24:10 +0000 (-0300)
Subject: bpf: remove redeclaration of new_n in bpf_verifier_vlog
X-Git-Tag: v6.11-rc1~163^2~68^2~53^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21ab4980e02d495174bc64c00ceb4d3cf87fadb1;p=thirdparty%2Flinux.git

bpf: remove redeclaration of new_n in bpf_verifier_vlog

This new_n is defined in the start of this function.
Its value is overwritten by `new_n = min(n, log->len_total);`
a couple lines before my change,
rendering the shadow declaration unnecessary.

Signed-off-by: Rafael Passos <rafael@rcpassos.me>
Link: https://lore.kernel.org/r/20240615022641.210320-4-rafael@rcpassos.me
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c
index 3f4ae92e549ff..5aebfc3051e3a 100644
--- a/kernel/bpf/log.c
+++ b/kernel/bpf/log.c
@@ -91,7 +91,7 @@ void bpf_verifier_vlog(struct bpf_verifier_log *log, const char *fmt,
 			goto fail;
 	} else {
 		u64 new_end, new_start;
-		u32 buf_start, buf_end, new_n;
+		u32 buf_start, buf_end;
 
 		new_end = log->end_pos + n;
 		if (new_end - log->start_pos >= log->len_total)