Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp1790516rwn; Fri, 9 Sep 2022 04:15:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR7HT93pk8yZJT43vPSJ4mEj+EfpPgQLkcEm2gF8PqpcWT6lboWsm44HGSmXUs0Guj9Yoajn X-Received: by 2002:a17:902:7586:b0:172:d0de:7a3c with SMTP id j6-20020a170902758600b00172d0de7a3cmr13330731pll.38.1662722100375; Fri, 09 Sep 2022 04:15:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662722100; cv=none; d=google.com; s=arc-20160816; b=BRQqtAlEF9wzeeOfv9xHl0vLRxI88Kce//HgwfreT7Rg50eF+G0/nWZr8J4H/bgz5m vQ9oDX9pfsPOjvBOx16wT3Bdxt+SAmySMklAUnNtHWaV70DiRqXhkoRL1Y9iYXIwVTjx 07FwFzRTuuZcwtNyNXc/FPMImMfCtZOFyD13lRrbfKFlLMMgy74QKIUB1uX29rvS6uNM kJRhK1h0SIfHAOIlFA4S2EPWyvsUiTaW9X5hD9XDHZfPpyxaquhNu9VqomSpFCATD4VD 29JeXgY2wazz98MM3h/UbbOKPH1QzUAURwUgM5GwTO3YcIq7nxgEXeBFuL6Uc5Ag6fl9 Ry0A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=POmAXduJ6SI7RVAAlYyvfPFre0sPrROg8vVQxGKuQEo=; b=M1BF3LRl3iOqaTA3A8xu54u/Gc8IRvkHDjXF/IafqxYPppNGIC03PJ3Mbw5ANyJb/5 hJ0zxf+hQq2V0TR5WlzOlZhm41iFZpc+zrfy4bXDnJeE5eh+U6QX8yeTtIzOS0UAxiyV sfVQuEkSKmbPK1Aqnin3jpnfBRtAKwZnoQmQAwKhKRSSPHaAxGvAzXKy9tWxQZefLhxR D1+m6Zeqw+Sbo21PLwBO3/NgMJdJD6dl51iMkQ0T7FBwyQje6xeQacbRNZNLP/ug8pkR TIT2hZp5Qj3jEO5VQ/y41KMvERgqGJYa/KsTV/bJhrweYbOXYJ6QJm3oVYui5I0DrlD5 FpTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BNK0hnGy; 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=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a17090a0c0100b0020042669a1bsi238918pjs.159.2022.09.09.04.14.44; Fri, 09 Sep 2022 04:15:00 -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=@intel.com header.s=Intel header.b=BNK0hnGy; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230360AbiIILA7 (ORCPT + 99 others); Fri, 9 Sep 2022 07:00:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbiIILAl (ORCPT ); Fri, 9 Sep 2022 07:00:41 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51FBD7285E for ; Fri, 9 Sep 2022 04:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662721205; x=1694257205; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fusilmdSQD+FIBKYeUukiHJrxKRQ3B5pPSTTQeO8rTk=; b=BNK0hnGy6vNtAmHTWdoKX4tqBQ/jQX6fpX2qvrmAyvp7hGMRXuaV5uln u6HPlhhRC/731IkSNCdp96WlkXZ5O1RfBcqUXH7F2VHnt6QFnT6Gvqf7m DvbMOSX2uYkzBVB6RrEwzQA4DCjXELyXHTLqt+JDTXGhJ70wQW/bQDN7f VPRABQ3J5pv0v5ztPvyOJJMCKJHz2zNE4vjNzis/i6Nir5ROnn06+A0Qm VY03wkFcHfDKPDHEBYhOK5OA/UVCWqR9huhoJONsR9jqefdPTibKKmDCh BmH5WQW/yAAC3IPrgBW6pdzxaUUj1a5CxnUZFSN1mr6RznBehfjzhVRQQ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10464"; a="297449584" X-IronPort-AV: E=Sophos;i="5.93,303,1654585200"; d="scan'208";a="297449584" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2022 04:00:03 -0700 X-IronPort-AV: E=Sophos;i="5.93,303,1654585200"; d="scan'208";a="704370438" Received: from clbarnes-mobl.amr.corp.intel.com (HELO paris.amr.corp.intel.com) ([10.254.42.92]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2022 04:00:00 -0700 From: Gwan-gyeong Mun To: intel-gfx@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, mchehab@kernel.org, chris@chris-wilson.co.uk, matthew.auld@intel.com, thomas.hellstrom@linux.intel.com, jani.nikula@intel.com, nirmoy.das@intel.com, airlied@redhat.com, daniel@ffwll.ch, andi.shyti@linux.intel.com, andrzej.hajda@intel.com, keescook@chromium.org, mauro.chehab@linux.intel.com, linux@rasmusvillemoes.dk, vitor@massaru.org, dlatypov@google.com, ndesaulniers@google.com Subject: [PATCH v10 7/9] drm/i915: Check if the size is too big while creating shmem file Date: Fri, 9 Sep 2022 19:59:11 +0900 Message-Id: <20220909105913.752049-8-gwan-gyeong.mun@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220909105913.752049-1-gwan-gyeong.mun@intel.com> References: <20220909105913.752049-1-gwan-gyeong.mun@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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_NONE,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 The __shmem_file_setup() function returns -EINVAL if size is greater than MAX_LFS_FILESIZE. To handle the same error as other code that returns -E2BIG when the size is too large, it add a code that returns -E2BIG when the size is larger than the size that can be handled. v4: If BITS_PER_LONG is 32, size > MAX_LFS_FILESIZE is always false, so it checks only when BITS_PER_LONG is 64. Signed-off-by: Gwan-gyeong Mun Cc: Chris Wilson Cc: Matthew Auld Cc: Thomas Hellström Reviewed-by: Nirmoy Das Reviewed-by: Mauro Carvalho Chehab Reported-by: kernel test robot Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index 339b0a9cf2d0..ca30060e34ab 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -541,6 +541,20 @@ static int __create_shmem(struct drm_i915_private *i915, drm_gem_private_object_init(&i915->drm, obj, size); + /* XXX: The __shmem_file_setup() function returns -EINVAL if size is + * greater than MAX_LFS_FILESIZE. + * To handle the same error as other code that returns -E2BIG when + * the size is too large, we add a code that returns -E2BIG when the + * size is larger than the size that can be handled. + * If BITS_PER_LONG is 32, size > MAX_LFS_FILESIZE is always false, + * so we only needs to check when BITS_PER_LONG is 64. + * If BITS_PER_LONG is 32, E2BIG checks are processed when + * i915_gem_object_size_2big() is called before init_object() callback + * is called. + */ + if (BITS_PER_LONG == 64 && size > MAX_LFS_FILESIZE) + return -E2BIG; + if (i915->mm.gemfs) filp = shmem_file_setup_with_mnt(i915->mm.gemfs, "i915", size, flags); -- 2.37.1