From patchwork Wed Dec 22 08:16:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12691233 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA715C433EF for ; Wed, 22 Dec 2021 08:17:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03E3B10E65B; Wed, 22 Dec 2021 08:17:05 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 054D910E65B for ; Wed, 22 Dec 2021 08:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640161023; x=1671697023; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=rPatcYipO6ZXln0Q7Oi/E1bo0QUNfKMmjhJWK8Kwq+M=; b=ZcB+MoVjmAT6zEjIAllAV7FW+KCm4bO2ftvWBsqCFm5ViRgclaQB8ICh VuIRcsR8mvKQDtQnexsmPZE60TwCyVuGevBA1MkygQjVUvU/mEsJAXCOX rv1nhDEXXPT4SxIQv1QGCUito4RjOz11Gn459Q3KL7shmSBuXDHdnNb7b gqqhW/h4wIFixJVGLnioShKK0SDa15BaAjjM7AjkWDYscBmXSi8YO3sje +ZQzO/PAf7/V+X1Wpk63IL/NSTzQuiMrxj9rK67PaVBtRmj9z7MZKnNI4 nFzyikF3N34y/Sfmh2uDS8RCOtMkG92BZqWTRdFSo9ZxRw8yg7LeEjWGX A==; X-IronPort-AV: E=McAfee;i="6200,9189,10205"; a="221250100" X-IronPort-AV: E=Sophos;i="5.88,225,1635231600"; d="scan'208";a="221250100" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2021 00:17:02 -0800 X-IronPort-AV: E=Sophos;i="5.88,225,1635231600"; d="scan'208";a="466592887" Received: from aravind2-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.9.217]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2021 00:16:59 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Dec 2021 10:16:54 +0200 Message-Id: <20211222081654.1843211-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2] drm/i915/bios: fix slab-out-of-bounds access X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Lucas De Marchi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" If VBT size is not a multiple of 4, the last 4-byte store will be out of bounds of the allocated buffer. Spotted with KASAN. Round up the allocation size. v2: Use round_up() intead of roundup() as it's a power of 2 (Thomas) Reported-by: Thomas Hellström Fixes: a36e7dc0af1c ("drm/i915/dg1: Read OPROM via SPI controller") Cc: Clint Taylor Cc: Lucas De Marchi Reviewed-by: Thomas Hellström Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 76a8f001f4c4..c7a8d517ce81 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2369,7 +2369,7 @@ static struct vbt_header *spi_oprom_get_vbt(struct drm_i915_private *i915) vbt_size = intel_uncore_read(&i915->uncore, PRIMARY_SPI_TRIGGER); vbt_size &= 0xffff; - vbt = kzalloc(vbt_size, GFP_KERNEL); + vbt = kzalloc(round_up(vbt_size, 4), GFP_KERNEL); if (!vbt) goto err_not_found;