From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62A45C10F0E for ; Thu, 18 Apr 2019 18:07:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C13821872 for ; Thu, 18 Apr 2019 18:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610823; bh=5nSmCcPbIpASKzdeIYBzAwmQCcchzc3qseVcePUQNb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yDRifUg33jmninuPqdFgKgkIIWugD6eDkaMVAb1D7B6bvzXfYGgvOb4EqPAcJjfOF lNf/QKeGui8gGvrhbHuMWNDFFGpHu9/bCvnvGlxDaIQa1AyjLI2RHNJZkjpg1GR2q8 9NBIU2lVhbmk0jAqDM+34FHw3Qw0SMteK1v7mhxo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391174AbfDRSHC (ORCPT ); Thu, 18 Apr 2019 14:07:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:37138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391570AbfDRSHB (ORCPT ); Thu, 18 Apr 2019 14:07:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 954D72186A; Thu, 18 Apr 2019 18:07:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610821; bh=5nSmCcPbIpASKzdeIYBzAwmQCcchzc3qseVcePUQNb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cla9a/rHLtoJ5M2uR8tr0nsVqG0VGOzaZuadbSvW6Cz7rd61xEU6QHIA+wD7TkObL lNs59EITIrF0gtsqyaK/7v7+PAm1Go9680M0gN3EleD4F+NgznzQ9Lcm9HtiKqZ9JM 8HZJygUiiCR3PHbfZswb1bkbSjhJ8OYEQYaP+qdA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexei Starovoitov , John Fastabend , Daniel Borkmann , Balbir Singh Subject: [PATCH 4.14 76/92] bpf: fix stack state printing in verifier log Date: Thu, 18 Apr 2019 19:57:34 +0200 Message-Id: <20190418160436.908926030@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160430.325165109@linuxfoundation.org> References: <20190418160430.325165109@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexei Starovoitov commit 12a3cc8424fe1237aaeb982dec4f0914ddd22f3e upstream. fix incorrect stack state prints in print_verifier_state() Fixes: 638f5b90d460 ("bpf: reduce verifier memory consumption") Signed-off-by: Alexei Starovoitov Acked-by: John Fastabend Acked-by: Daniel Borkmann Signed-off-by: Daniel Borkmann Signed-off-by: Balbir Singh Signed-off-by: Greg Kroah-Hartman --- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -268,7 +268,7 @@ static void print_verifier_state(struct for (i = 0; i < state->allocated_stack / BPF_REG_SIZE; i++) { if (state->stack[i].slot_type[0] == STACK_SPILL) verbose(" fp%d=%s", - -MAX_BPF_STACK + i * BPF_REG_SIZE, + (-i - 1) * BPF_REG_SIZE, reg_type_str[state->stack[i].spilled_ptr.type]); } verbose("\n");