From patchwork Mon Oct 24 11:32:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9879 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp569526wru; Mon, 24 Oct 2022 10:28:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6YvryWthE06t9URcUGxhvaJpOyDo8ngiBwxaSk1QgMqR7DQA4jgtZrjDutomBHq1WLHK/L X-Received: by 2002:a17:907:1b1f:b0:72f:56db:cce9 with SMTP id mp31-20020a1709071b1f00b0072f56dbcce9mr27983777ejc.605.1666632518672; Mon, 24 Oct 2022 10:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666632518; cv=none; d=google.com; s=arc-20160816; b=K1Bp6CwjuvlaRP4AKnUCKanqiAmpKIk7/O/UahW5YD7liQOSXFcSpU9zmR0sH0JK8Q f+Uy4wvqkG2mTChEAoeG606ZAIIZYW5dH2HJo+L4/ixn51NqlObQB0UspbcF3OUeZnhU AiB7JI8wbg3h22gM9NcQ/vvBZGz9qV7X5hMsricvRm03cHu1ZEmjFMn1mTLifoOsfHn4 iNHuZi8lk7QLrG3ZNtlJ/1hMaPXTHM4k7gvXE4pPKmQw3ZB3yzCqPnDGeZ4KxgOkDIBv n7jYto7vKVJMA2CXaCf02XLdWQlhCBSEYG0A5RusrXy5h8Vmx0sA1zp3XCvdV+F1Xp31 4D4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SeZ5E32sJN8qhzvAQOlRvDanXZZxFmMq3O+UHlFl+HU=; b=c3OEZtZyHXfuTP9XF/zpjUcgzTSZKweZu07J4oVFGjbn8g7txhKMRmK+zFpccPcYlA hTJaH3ZodSqZ5a0BYISRrDs8ltIYSda1G5iwIIi6Y/wvb8/8+yBOlW4EvJW/9qBtIi73 w/twNW+gFv/VmqTJMmTMRPflxT64J6zSVPAFfO3gc0oAH1Iu5PbeG7FeXJsuSblWcq18 qPvLlbzNFBRSX9Ni2GwqTWzDdQZuD7OygmTsMkk2p5RHRlxTNsYh4uDK+pYFBt8oAFDM mYPd6atCP5IM6z8ZRwgkqT4A16SQfdtLMz2Uh5BW68O7GLYKClG17DSGun7WWsVCZ6vH v24Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XkDDpBvk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j26-20020aa7c0da000000b004520b01a355si319210edp.52.2022.10.24.10.28.13; Mon, 24 Oct 2022 10:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XkDDpBvk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235304AbiJXRNw (ORCPT + 99 others); Mon, 24 Oct 2022 13:13:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235169AbiJXRN1 (ORCPT ); Mon, 24 Oct 2022 13:13:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45511E0F9; Mon, 24 Oct 2022 08:48:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CD35A612FC; Mon, 24 Oct 2022 12:51:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6FA0C433D7; Mon, 24 Oct 2022 12:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615864; bh=Ni3aGGiJlZu9KJ4N6LRidb1HrO9afGdBuz4Hc+sk+7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkDDpBvk3m6XzfDi6bZn8+6Pz04RhH12WWAc6LwqhLRNinUdBjaqdg8tiFhrJ9a3f E5XZbUC9lphaAO2nd0x8RD2hG/026m5/rkI1PYmkbuTnebRPDA1cqFoo0KGmv3+ols 0N1vBndWfaGcH8yunl4dh0iJ6Eujs/JiSQUR4o8o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , xen-devel@lists.xenproject.org, Kees Cook , Sasha Levin Subject: [PATCH 5.15 412/530] x86/entry: Work around Clang __bdos() bug Date: Mon, 24 Oct 2022 13:32:36 +0200 Message-Id: <20221024113103.742966550@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747590860088835584?= X-GMAIL-MSGID: =?utf-8?q?1747590860088835584?= From: Kees Cook [ Upstream commit 3e1730842f142add55dc658929221521a9ea62b6 ] Clang produces a false positive when building with CONFIG_FORTIFY_SOURCE=y and CONFIG_UBSAN_BOUNDS=y when operating on an array with a dynamic offset. Work around this by using a direct assignment of an empty instance. Avoids this warning: ../include/linux/fortify-string.h:309:4: warning: call to __write_overflow_field declared with 'warn ing' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wat tribute-warning] __write_overflow_field(p_size_field, size); ^ which was isolated to the memset() call in xen_load_idt(). Note that this looks very much like another bug that was worked around: https://github.com/ClangBuiltLinux/linux/issues/1592 Cc: Juergen Gross Cc: Boris Ostrovsky Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: xen-devel@lists.xenproject.org Reviewed-by: Boris Ostrovsky Link: https://lore.kernel.org/lkml/41527d69-e8ab-3f86-ff37-6b298c01d5bc@oracle.com Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- arch/x86/xen/enlighten_pv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 133ef31639df..561aad13412f 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -759,6 +759,7 @@ static void xen_load_idt(const struct desc_ptr *desc) { static DEFINE_SPINLOCK(lock); static struct trap_info traps[257]; + static const struct trap_info zero = { }; unsigned out; trace_xen_cpu_load_idt(desc); @@ -768,7 +769,7 @@ static void xen_load_idt(const struct desc_ptr *desc) memcpy(this_cpu_ptr(&idt_desc), desc, sizeof(idt_desc)); out = xen_convert_trap_info(desc, traps, false); - memset(&traps[out], 0, sizeof(traps[0])); + traps[out] = zero; xen_mc_flush(); if (HYPERVISOR_set_trap_table(traps))