Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2548914iob; Fri, 6 May 2022 05:32:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoGNanQ+UvqTIs04v8b/eFEb5HF+Isw1x6PJ+DYTELTJAR/OKZtVZZ0xCe9nN6iy2uu6pv X-Received: by 2002:a17:907:3f8a:b0:6f4:3f00:b1e9 with SMTP id hr10-20020a1709073f8a00b006f43f00b1e9mr2797361ejc.59.1651840325698; Fri, 06 May 2022 05:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651840325; cv=none; d=google.com; s=arc-20160816; b=bcDDkePxzbhxZ9Jm4lD2UlValRJXL1pv2TQx0+f39bEIiA1D6WfRP7sJC/Mdpe/XeA QsbEmigUuWwT+2v7vz/4NIiwF1v0RgiqZMkV+YvewDaZbLthMTTB535hm/aySu6ZOhS7 jME8qpL2vj0t3axLaAwuvGliR11ZUjB7fZYKRuTNExcHoXKSoh1aNfO9UpZH7tDAgINV mWIIOM6WqUTu32wlVj0fFw0EA1Jw7Fto+0ec08dkgpwRGdj7w5OBR3AzTfIIvwu8nJ/M n9Sg3UWPTHUlrIfkq7dHEiRUz9MsJdYbG6zsyID2rCAzyBHQA8sRVlGvodwVeTgmvoJA 6Yew== 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=axJEEek53t5ZKBneooLq4o3pMJylBxVLhDmjnOK8et4=; b=C9dH4fQtM2v/blAMu5RPWwIEoe6523dlu/fYskynMXMvZVB3kFbgn/sDgFHB1L5Yr9 D04hSLJMHHVJif/eNWYNkMf7xsJIs9IgYePQ/hL15N30jZkHUFu+x7iK/vB+otUh7vMW IC4TQU4uzCTsi5JjvKyIfv9oBle55ZnOeZbIu/rbzRvMrTNebGSunEK2d9vqW71AayZf lSKm3NJgEN5+dn3d+Fatsy3VOa9kmJqheb3BWR/04QQClHqYhjKayUaNtNvLGdZ1+9IG XAchip26Bl4t9RN+a584TnXvveil6H/XyDXJ9EaVn/O+Po0QrxzGO/j+KH4zrPaJgH5c hOJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W4IulEXb; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go37-20020a1709070da500b006e7fd3dea07si6237243ejc.698.2022.05.06.05.31.38; Fri, 06 May 2022 05:32:05 -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=W4IulEXb; 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 S1359648AbiEDRth (ORCPT + 99 others); Wed, 4 May 2022 13:49:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357665AbiEDRPK (ORCPT ); Wed, 4 May 2022 13:15:10 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B394B55353; Wed, 4 May 2022 09:58:50 -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 sin.source.kernel.org (Postfix) with ESMTPS id 3445ECE2625; Wed, 4 May 2022 16:58:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59836C385AF; Wed, 4 May 2022 16:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683503; bh=XtYdCKKZ7/RbwsonQHN6VD23oGwc3Zi25SgQJ6Oj4q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4IulEXbWmjtpLT+MDAFwQgOCIM4YZJoDoyD/7whpghmMZRkMAKcKhIegzsjPTH2v aW4TM0agUIzZ5Trg/sby7xAIwom/fK6/oWN5XEK3yko1bhhO8ilvgTTA9VT9c4WZ5N A+qHBwgiV9WFhHH6SujJi1ZEGQ7tunvH1mf5yXrE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikulas Patocka , Linus Torvalds , Sasha Levin Subject: [PATCH 5.17 170/225] x86: __memcpy_flushcache: fix wrong alignment if size > 2^32 Date: Wed, 4 May 2022 18:46:48 +0200 Message-Id: <20220504153125.412043593@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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 From: Mikulas Patocka [ Upstream commit a6823e4e360fe975bd3da4ab156df7c74c8b07f3 ] The first "if" condition in __memcpy_flushcache is supposed to align the "dest" variable to 8 bytes and copy data up to this alignment. However, this condition may misbehave if "size" is greater than 4GiB. The statement min_t(unsigned, size, ALIGN(dest, 8) - dest); casts both arguments to unsigned int and selects the smaller one. However, the cast truncates high bits in "size" and it results in misbehavior. For example: suppose that size == 0x100000001, dest == 0x200000002 min_t(unsigned, size, ALIGN(dest, 8) - dest) == min_t(0x1, 0xe) == 0x1; ... dest += 0x1; so we copy just one byte "and" dest remains unaligned. This patch fixes the bug by replacing unsigned with size_t. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/x86/lib/usercopy_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 0402a749f3a0..0ae6cf804197 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -119,7 +119,7 @@ void __memcpy_flushcache(void *_dst, const void *_src, size_t size) /* cache copy and flush to align dest */ if (!IS_ALIGNED(dest, 8)) { - unsigned len = min_t(unsigned, size, ALIGN(dest, 8) - dest); + size_t len = min_t(size_t, size, ALIGN(dest, 8) - dest); memcpy((void *) dest, (void *) source, len); clean_cache_range((void *) dest, len); -- 2.35.1