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=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 6487CC6379D for ; Tue, 24 Nov 2020 21:46:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA1DF2083E for ; Tue, 24 Nov 2020 21:46:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="eRM5pcDj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731361AbgKXVpu (ORCPT ); Tue, 24 Nov 2020 16:45:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732515AbgKXVpo (ORCPT ); Tue, 24 Nov 2020 16:45:44 -0500 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 476ACC061A4D for ; Tue, 24 Nov 2020 13:45:44 -0800 (PST) Received: by mail-pf1-x443.google.com with SMTP id b6so322692pfp.7 for ; Tue, 24 Nov 2020 13:45:44 -0800 (PST) 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=qUk28dgg2DUj1+6HYL179P0h9eGbzR54HIME/VXKOvg=; b=eRM5pcDjTejd77WL4qH2l3Waz69TXUmimfeFmBp2KHeoI2kfUj04HHD+5AX5l7h/w1 itFs9VMoa+OfcKZEFM2+nNziTHhP1TuagNH1mSUGrd7szPzTIDoItWAQpcFZaq7E0jDr YVscjYb/iBIjuSqEbH0Z5p2PzgyBUZdEvhQRI= 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=qUk28dgg2DUj1+6HYL179P0h9eGbzR54HIME/VXKOvg=; b=k4iooVsWjeVnrY0hQUqMMTZa0K2SZfCfqP3xsDGpYkcrPoRJIjAwNDH0nAeYC+sCpd eWvORp5OfX5UVEfatkygJYNVsegv36Qaq5JhqT+6RlXba5HzlCpccx8Cun7hVEhUba9R BfDVg8NHl/a8tK6Ur5F+fpOu+uVtBukV10UluqWUC42YGT8l2f3GTjLa6TYX1JUmto9H BiGEByBHLKcHs3BeuabGjRgkrFiR2u9W+yQLGBM5aqSVSvqxQUJ/XyU2wObfbrlOa4nV WBzW84T+05I90qqBf3fnaFF/BhRk9pgXv/qgTRDUlLvvAEPbxn+hFeI5vl2t29C5GWTQ JuvQ== X-Gm-Message-State: AOAM532RjT0sJWiZa2td6ILwbQAZ/0H5LWkEOqV5fK1IR7h9EMbICiNl aTFo5k/09dhOehqjTjT/kb6ofQ== X-Google-Smtp-Source: ABdhPJwv8R+bkXuk+Z/BW6O2He05dVF33WUNfAsVqf9ApwHY3+AZ3TRvyrcxfXYudQSX8IyrNUawFA== X-Received: by 2002:a63:cf52:: with SMTP id b18mr344446pgj.338.1606254343911; Tue, 24 Nov 2020 13:45:43 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id z10sm17931pfa.149.2020.11.24.13.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 13:45:43 -0800 (PST) Date: Tue, 24 Nov 2020 13:45:42 -0800 From: Kees Cook To: Gabriel Krisman Bertazi Cc: Jann Horn , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , Naresh Kamboju , open list , Netdev , bpf , lkft-triage@lists.linaro.org, Linux ARM , Daniel Borkmann , Andrii Nakryiko , Song Liu , Yonghong Song , Andy Lutomirski , Sumit Semwal , Arnd Bergmann , YiFei Zhu Subject: Re: [PATCH] entry: Fix boot for !CONFIG_GENERIC_ENTRY Message-ID: <202011241345.FAF4D7E@keescook> References: <87h7pgqhdf.fsf@collabora.com> <87a6v8qd9p.fsf_-_@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87a6v8qd9p.fsf_-_@collabora.com> Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Mon, Nov 23, 2020 at 10:54:58AM -0500, Gabriel Krisman Bertazi wrote: > Gabriel Krisman Bertazi writes: > > > Jann Horn writes: > >> As part of fixing this, it might be a good idea to put "enum > >> syscall_work_bit" behind a "#ifdef CONFIG_GENERIC_ENTRY" to avoid > >> future accidents like this? > > > > Hi Jan, Arnd, > > > > That is correct. This is a copy pasta mistake. My apologies. I didn't > > have a !GENERIC_ENTRY device to test, but just the ifdef would have > > caught it. > > I have patched it as suggested. Tested on qemu for arm32 and on bare > metal for x86-64. > > Once again, my apologies for the mistake. > > -- >8 -- > Subject: [PATCH] entry: Fix boot for !CONFIG_GENERIC_ENTRY > > A copy-pasta mistake tries to set SYSCALL_WORK flags instead of TIF > flags for !CONFIG_GENERIC_ENTRY. Also, add safeguards to catch this at > compilation time. > > Reported-by: Naresh Kamboju > Suggested-by: Jann Horn > Signed-off-by: Gabriel Krisman Bertazi Thanks for getting this fixed! 3136b93c3fb2 ("entry: Expose helpers to migrate TIF to SYSCALL_WORK flags") Reviewed-by: Kees Cook -- Kees Cook