From patchwork Thu Aug 22 15:32:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1151666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46DpSk4gsHz9sNC; Fri, 23 Aug 2019 01:32:54 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i0p51-0005Z0-1U; Thu, 22 Aug 2019 15:32:51 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1i0p4y-0005YK-LJ for kernel-team@lists.ubuntu.com; Thu, 22 Aug 2019 15:32:48 +0000 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1i0p4y-0003za-AT for kernel-team@lists.ubuntu.com; Thu, 22 Aug 2019 15:32:48 +0000 Received: by mail-wm1-f71.google.com with SMTP id g5so3106945wmh.1 for ; Thu, 22 Aug 2019 08:32:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pBpjs0CwX450Fn7rwOIkc0+VLpP42+dQgpgwJgeXsBY=; b=H0uTnOZV3Jx7zhGxKiONsWzE/404e4TIMCKgA8qesa0+RGrSUixpKIHIQoLC3bTdAg AFiOxTACWvQA5kXtQit8ztHzhCpS+VWro7H10yWm/OQPc44LYgoYev6ZT9OR0EI6uIiP kIrOaVpCX0NfTPgIBMT0en1GJMFn8eo3bw8AQADVeKtoIlJVhsGtH2htApo6Ewlc/iVQ yWVITPQ70W52PTOXIuu9QaFrkg9JoPfGWpaHFmNLrKARfa4m+JSJQmRYDZgJUPUMhIHr ANCS5k/VYfOSEJ9YwU6AwDQIC6dfQ4uGiWXKukA+fw1xuo3v6CYSh5eY0B7Q/4x4AnWt PW0Q== X-Gm-Message-State: APjAAAX2M3hfYpLbdmcEayliswFAUc83gHmUt+z5eG4HFZB1DbMI6ABX JWANGQTD7PCmrQiazAQK9Ufbrk0efwWBFyZAU5QmDXtgxcpbDYYUoxwbMoag8mKqsEAVprD2fEM x/KPrEY7QTXZef/VSy5WuE/JgkC1itCVw12j2qphGiA== X-Received: by 2002:a1c:3945:: with SMTP id g66mr6913480wma.139.1566487967586; Thu, 22 Aug 2019 08:32:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0hNi3ETw0LUyQJijyo1jgll/gvYeDGHwmE0L8tUU8TDZQILTEkITQe+sWExvgAn+ocwl9xQ== X-Received: by 2002:a1c:3945:: with SMTP id g66mr6913462wma.139.1566487967392; Thu, 22 Aug 2019 08:32:47 -0700 (PDT) Received: from localhost (ip5f5aee3f.dynamic.kabel-deutschland.de. [95.90.238.63]) by smtp.gmail.com with ESMTPSA id m23sm4541788wml.41.2019.08.22.08.32.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Aug 2019 08:32:46 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/1] UBUNTU: SAUCE: Fix "bpf: relax verifier restriction on BPF_MOV | BPF_ALU" Date: Thu, 22 Aug 2019 17:32:44 +0200 Message-Id: <20190822153244.14818-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190822153244.14818-1-kleber.souza@canonical.com> References: <20190822153244.14818-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1840935 Commit a25d38b54163 (bpf: relax verifier restriction on BPF_MOV | BPF_ALU), upstream commit e434b8cdf788568ba65a0a0fd9f3cb41f3ca1803, breaks the compilation of bpf selftests because Bionic misses 111e6b45315c (selftests/bpf: make test_verifier run most programs), which adds the 'retval' member to struct bpf_test. Fix it by removing the setting of '.retval = 0', which isn't needed for the current code in Bionic. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Connor Kuehl Acked-by: Kamal Mostafa --- tools/testing/selftests/bpf/test_verifier.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 5a25a4d7d81f..95e9e751862a 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -2170,7 +2170,6 @@ static struct bpf_test tests[] = { BPF_EXIT_INSN(), }, .result = ACCEPT, - .retval = 0, }, { "unpriv: partial copy of pointer",