From: Andrey Ignatov <rdna@fb.com>
Date: Thu, 4 Apr 2019 06:22:43 +0000 (-0700)
Subject: bpf: Add missed newline in verifier verbose log
X-Git-Tag: Ubuntu-4.15.0-89.89~77
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a79a9b1c42669b1eb687a6fe5f5f7b23fb95a4a2;p=mirror_ubuntu-bionic-kernel.git

bpf: Add missed newline in verifier verbose log

BugLink: https://bugs.launchpad.net/bugs/1863019

[ Upstream commit 1fbd20f8b77b366ea4aeb92ade72daa7f36a7e3b ]

check_stack_access() that prints verbose log is used in
adjust_ptr_min_max_vals() that prints its own verbose log and now they
stick together, e.g.:

  variable stack access var_off=(0xfffffffffffffff0; 0x4) off=-16
  size=1R2 stack pointer arithmetic goes out of range, prohibited for
  !root

Add missing newline so that log is more readable:
  variable stack access var_off=(0xfffffffffffffff0; 0x4) off=-16 size=1
  R2 stack pointer arithmetic goes out of range, prohibited for !root

Fixes: f1174f77b50c ("bpf/verifier: rework value tracking")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
---

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 105cdfcd7d56..8fd7b08b9201 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -865,7 +865,7 @@ static int check_stack_access(struct bpf_verifier_env *env,
 		char tn_buf[48];
 
 		tnum_strn(tn_buf, sizeof(tn_buf), reg->var_off);
-		verbose(env, "variable stack access var_off=%s off=%d size=%d",
+		verbose(env, "variable stack access var_off=%s off=%d size=%d\n",
 			tn_buf, off, size);
 		return -EACCES;
 	}