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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C74D6C07E9D for ; Tue, 27 Sep 2022 19:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230169AbiI0T3m (ORCPT ); Tue, 27 Sep 2022 15:29:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230159AbiI0T3k (ORCPT ); Tue, 27 Sep 2022 15:29:40 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E334613D13 for ; Tue, 27 Sep 2022 12:29:37 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id v4so10260255pgi.10 for ; Tue, 27 Sep 2022 12:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=r7xtOlqozdraYuJQ03gkzLKn3JQTQXmOM1qxZT3pBcY=; b=UMdWyNVZoSeG/LH6JnFOGTLkiBy8XOAjfwOhPLacP+EuDSAzHegFmRrkNJVbJml4w0 +66qymozL27sUk6qvYYNQVaUc8AUDC69AVvnSeIOBVgOGfb4joh9UwENQTZE8nyJpym8 4e3SET7aWlRYxjK8Pd3GKIKEv76Lar91eTk18= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=r7xtOlqozdraYuJQ03gkzLKn3JQTQXmOM1qxZT3pBcY=; b=AH5mNVxSMZbDSzCDac/BJjo2ARnJuFd/FpQJj9QboPZIPWd1koJeuFR5R5JVhDKvxD TWuACm2ifyfzbvSXJMA5nYBx8k3BEHVdPbi3DvXA38kYkRKLI6iRFkZH1+8px3BqefUU mLK4/85SX6wU6oRf4XWCTgCk6pF6i9LhyE9WXLt9qKRTKb8IRgRGwpVtcPzoe4o5/cjE 4C4PEPbUh6a8gRgf95W8W9v9qbANaPctqEWJBszx9N46uGLeOBX30rqcF2IQ1HhJJ5a5 481Ph9MI51VDcWX2edgoRBs3vtGq+nrzHMas93xzRStD7PsNeAnlfmkyIv3De/6zlpdO N5Yw== X-Gm-Message-State: ACrzQf3ESsTilAtp6X+oysgl3r9n5qxz9MUhch8O2yzrcIwi81t/MUG4 p4NEVb/FTvZvkvriNCI5yQ+SVto6+ieBmQ== X-Google-Smtp-Source: AMsMyM725HiIaC0qEscbFIhpL4ExQ1jfMBoVpTOEfDK4z6YpUJkMbo9KXGSYhiPWFhpY5VL/cejpbg== X-Received: by 2002:a05:6a00:114c:b0:528:2c7a:6302 with SMTP id b12-20020a056a00114c00b005282c7a6302mr30834862pfm.37.1664306977316; Tue, 27 Sep 2022 12:29:37 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d18-20020a170902ced200b0017808db132bsm1978221plg.137.2022.09.27.12.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 12:29:36 -0700 (PDT) Date: Tue, 27 Sep 2022 12:29:35 -0700 From: Kees Cook To: broonie@kernel.org Cc: Linux Kernel Mailing List , Linux Next Mailing List , Sami Tolvanen , Will Deacon Subject: Re: linux-next: manual merge of the kspp tree with the arm64-fixes tree Message-ID: <202209271228.EFA1956958@keescook> References: <20220927190318.513999-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220927190318.513999-1-broonie@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Sep 27, 2022 at 08:03:18PM +0100, broonie@kernel.org wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > include/asm-generic/vmlinux.lds.h > > between commit: > > 13b0566962914 ("vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment") > > from the arm64-fixes tree and commit: > > 89245600941e4 ("cfi: Switch to -fsanitize=kcfi") > > from the kspp tree. > > 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. > > diff --cc include/asm-generic/vmlinux.lds.h > index ae63dd8a3a2cf,7501edfce11ea..0000000000000 > --- a/include/asm-generic/vmlinux.lds.h > +++ b/include/asm-generic/vmlinux.lds.h > > [The block updated in Will's commit is just plain removed with no > equivalent in kspp] Right, this is correct. 13b0566962914 (a fix for the previous CFI implementation) becomes useful for -stable backports, but is entirely removed for the new CFI implementation. -- Kees Cook