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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 92BE0C433DF for ; Tue, 7 Jul 2020 08:26:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C252206DF for ; Tue, 7 Jul 2020 08:26:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="A6nYUDqH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbgGGI0N (ORCPT ); Tue, 7 Jul 2020 04:26:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725825AbgGGI0N (ORCPT ); Tue, 7 Jul 2020 04:26:13 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13BC9C061755 for ; Tue, 7 Jul 2020 01:26:13 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id gc15so697571pjb.0 for ; Tue, 07 Jul 2020 01:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fgBIZf6Ou6ZCSQC003d8zpy8H4E/NqNG8qaxNJbkaL8=; b=A6nYUDqHUKTXBW7Pk1P9cL/T4itjOBAzbhA96iehBZV//QPjGHpg9eNxJQEG/VM9BU IVTsNsdxCGQgTIKnoSfkELHb3ndL+8gD/TgAQo/WJzQ0qaN/8Q83HIhJ58+cW1icXw3D Hgm/RgYlRgGnJv19R8ao/wfQ8Wv3vrCWEgVsE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fgBIZf6Ou6ZCSQC003d8zpy8H4E/NqNG8qaxNJbkaL8=; b=lRujIGI18LKFLEuhpt2zVUonkTsIkoTkzfImVRzMvtzgp8JwG/aMiwjjgc6YbXK8Bw rXkZlpcyMFfqxzSSAcY5W87194c2msOpPumjFESyOnaYRyzhc1NT5fkV7ZvHeiK/V6X0 M7gbM+X6TwufWd1zY8JF6/PxgLIThZ6NDhmxljbONqbqc5TQILUdtjhEJWPAKXq4n6u/ Hm3iYfjtEaEznaPGoU9Pt7LnNnP1doZ5N0C9LNbS3Xk7CSx+2VDH1O9GhUf7yIQkiVGN m57YizJGoW5PxznGrBpaMMr72R/Y0SHfhUpnB6xGabMtUKyZPw4r3jtAp9a0y25SKot6 sTGw== X-Gm-Message-State: AOAM532mbr6fpz5mrKQStsgeFNqpiVIiDcHrHQegi19DYe++IHGZjTUE pj/J6LVJulKv9rxQi4s9Eq5ulw== X-Google-Smtp-Source: ABdhPJxubdYJ+zA9s+j14s1peRxm9eOct8g9idUMim5bT+kkXQ+qoIFmxJYd5/+Qc/0bt77zbGH8fw== X-Received: by 2002:a17:90b:1b44:: with SMTP id nv4mr3016781pjb.24.1594110372613; Tue, 07 Jul 2020 01:26:12 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id z8sm194212pgz.7.2020.07.07.01.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 01:26:11 -0700 (PDT) Date: Tue, 7 Jul 2020 01:26:10 -0700 From: Kees Cook To: Stephen Rothwell Cc: Shuah Khan , Linux Next Mailing List , Linux Kernel Mailing List , Christian Brauner Subject: Re: linux-next: manual merge of the seccomp tree with the kselftest tree Message-ID: <202007070125.ECBAB9E7C3@keescook> References: <20200707145720.02636577@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200707145720.02636577@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 07, 2020 at 02:57:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the seccomp tree got a conflict in: > > tools/testing/selftests/seccomp/seccomp_bpf.c > > between commit: > > 9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP") > > from the kselftest tree and commits: > > aae7d264d68b ("selftests/seccomp: Check for EPOLLHUP for user_notif") > 11b4beaa0d31 ("selftests/seccomp: Make kcmp() less required") > ef332c970dfa ("selftests/seccomp: Rename user_trap_syscall() to user_notif_syscall()") > > from the seccomp tree. Har har -- a collision of my own creation. Yay lots of trees. ;) I'll make this go away; the cause is a harmless cleanup. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc tools/testing/selftests/seccomp/seccomp_bpf.c > index b878e8379966,b854a6c5bf49..000000000000 > --- a/tools/testing/selftests/seccomp/seccomp_bpf.c > +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c > @@@ -3079,10 -3043,8 +3055,10 @@@ TEST(get_metadata > long ret; > > /* Only real root can get metadata. */ > - if (geteuid()) > - XFAIL(return, "get_metadata test requires real root"); > + if (geteuid()) { > - SKIP(return, "get_metadata requires real root"); > ++ SKIP(return, "get_metadata test requires real root"); > + return; > + } > > ASSERT_EQ(0, pipe(pipefd)); > -- Kees Cook