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 F1A77ECAAD8 for ; Fri, 23 Sep 2022 00:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229727AbiIWA7h (ORCPT ); Thu, 22 Sep 2022 20:59:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbiIWA7e (ORCPT ); Thu, 22 Sep 2022 20:59:34 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92897FD7 for ; Thu, 22 Sep 2022 17:59:31 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id a29so10916487pfk.5 for ; Thu, 22 Sep 2022 17:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=zUURCqFsPJ0++1UISwKVFigZFjRPyYFwg3WX49XZqB0=; b=fm+3chTmqI62okWG0kjgJIfWMf5N0zHMQ5ViiaK0O3QpRW1tfmCkPQdYvX1265kzMF 4wG1JJFpAx6xkb/kl5ViWHvCXt80CcJBcOPRwA02jgctV554ZhijstpICZU0yycnCw8A bz1iym1Owjvo4okvjhR5qSfw0bd+24Ljukg2E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=zUURCqFsPJ0++1UISwKVFigZFjRPyYFwg3WX49XZqB0=; b=wRePNeDKjIzTvJNCv8PEQBUoXd+ncmOqL8H6+u7ma01KbdItoHgA/Yr+MzndV/CJdJ JaXg1LjY9D9L9NUcZ3v5GWdUBluwda97n5RfKcNJgOB1P+19xPQnFn+E1MI3jzyH0ZdX vtu2eHD1h2V3hA61nCvsG4kuZb2zNx4tGlVwphS8YjOANhzePg2NyMaibP8p7TqWHHS4 6lpADuAJdvaTLJe6lEiZc1cLaEHZS17GiSvyHRAGb0Ks1bnQVocAtXg1fHHm0iRC8jhp CfzNmH7ybMgA/fZhSpUBGmXqlnwvO/6TNGbcEP1/MLzsfuZa1T7Pjqluo51HvpZihyIA vhDw== X-Gm-Message-State: ACrzQf09phItVzS/f+vYvQoCQRgq4w2QKWfL36/aUZC8Ff2Iu/BvTQdG ZxFnIx/GwiLUdCyvpVah4m+HcQ== X-Google-Smtp-Source: AMsMyM5MooqD6aywJFynn+PaY22Xz0manESWBePduvhYSPk3ktw+blBKFMUWBvtXxWlfzex13+22/Q== X-Received: by 2002:a63:1554:0:b0:43b:f03d:8651 with SMTP id 20-20020a631554000000b0043bf03d8651mr5269327pgv.422.1663894771119; Thu, 22 Sep 2022 17:59:31 -0700 (PDT) Received: from localhost ([2620:15c:202:201:626:f1d5:7c9d:6576]) by smtp.gmail.com with UTF8SMTPSA id e16-20020a056a0000d000b0053b208b55d1sm5066933pfj.85.2022.09.22.17.59.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Sep 2022 17:59:30 -0700 (PDT) From: Daniel Verkamp To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , Borislav Petkov , Daniel Verkamp , stable@vger.kernel.org Subject: [PATCH] x86: also disable FSRM if ERMS is disabled Date: Thu, 22 Sep 2022 17:58:27 -0700 Message-Id: <20220923005827.1533380-1-dverkamp@chromium.org> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the "Fast Short REP MOVSB" path of memmove, if we take the path where the FSRM flag is enabled but the ERMS flag is not, there is no longer a check for length >= 0x20 (both alternatives will be replaced with NOPs). If a memmove() requiring a forward copy of less than 0x20 bytes happens in this case, the `sub $0x20, %rdx` will cause the length to roll around to a huge value and the copy will eventually hit a page fault. This is not intended to happen, as the comment above the alternatives mentions "FSRM implies ERMS". However, there is a check in early_init_intel() that can disable ERMS, so we should also be disabling FSRM in this path to maintain correctness of the memmove() optimization. Cc: stable@vger.kernel.org Fixes: f444a5ff95dc ("x86/cpufeatures: Add support for fast short REP; MOVSB") Signed-off-by: Daniel Verkamp --- arch/x86/kernel/cpu/intel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 2d7ea5480ec3..71b412f820c7 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -328,6 +328,7 @@ static void early_init_intel(struct cpuinfo_x86 *c) pr_info("Disabled fast string operations\n"); setup_clear_cpu_cap(X86_FEATURE_REP_GOOD); setup_clear_cpu_cap(X86_FEATURE_ERMS); + setup_clear_cpu_cap(X86_FEATURE_FSRM); } } -- 2.37.3.998.g577e59143f-goog