From patchwork Tue Feb 8 11:38:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12738566 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 BB713C433F5 for ; Tue, 8 Feb 2022 11:39:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0158B10E211; Tue, 8 Feb 2022 11:39:11 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D074610E179; Tue, 8 Feb 2022 11:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644320348; x=1675856348; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=kGFjpYxzUKbdYzhdaVE0eAbFb59GZXqm0cG24Mqkuzo=; b=F1VJQut/6liXCX3wqGPTWS2LBpNLZcGmiSQQAVnygRJBrocerObYpZIW 7dSv+kalmKvfd3uLWZzys/M46jq58sWteamifDNYCKxKcBIq2tCaCPqb+ 78RlrKxYkNdpBbxqGB0p7AYdHbI3zqwBwUEN7VukUKmV/Q6CHfZvPo6/i ORmuuJbaMSzM3XBhIO9n3I3CDhei5eT7EkPWU02/ZF0Rms4dAffdNjvVo EfGE9z1rY5CKfRi+dy50H7413uw6njgGGUGdzxDLgvWXw1xRKWXBmzniY qMSFtnVn68PJ5R76m+nMKorb7xwOesrwyxMQufoGaBlBVEvp1zfF/NLZi g==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="248878716" X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="248878716" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 03:39:08 -0800 X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="700816843" Received: from amcgrat2-mobl1.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.10.21]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 03:39:07 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Tue, 8 Feb 2022 11:38:15 +0000 Message-Id: <20220208113815.314048-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/buddy: fixup potential uaf 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: =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org, Arunpravin Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" If we are unlucky and somehow can't allocate enough memory when splitting blocks, where we temporarily end up with the given block and its buddy on the respective free list, then we need to ensure we delete both blocks, and not just the buddy, before potentially freeing them. v2: rebase on i915_buddy removal Fixes: 14d1b9a6247c ("drm/i915: buddy allocator") Signed-off-by: Matthew Auld Cc: Arunpravin Cc: Christian König --- drivers/gpu/drm/drm_buddy.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index d60878bc9c20..2bf75e8abfaa 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -333,8 +333,10 @@ drm_buddy_alloc_blocks(struct drm_buddy *mm, unsigned int order) return block; out_free: - if (i != order) + if (i != order) { + list_del(&block->link); __drm_buddy_free(mm, block); + } return ERR_PTR(err); } EXPORT_SYMBOL(drm_buddy_alloc_blocks); @@ -452,8 +454,10 @@ int drm_buddy_alloc_range(struct drm_buddy *mm, buddy = get_buddy(block); if (buddy && (drm_buddy_block_is_free(block) && - drm_buddy_block_is_free(buddy))) + drm_buddy_block_is_free(buddy))) { + list_del(&block->link); __drm_buddy_free(mm, block); + } err_free: drm_buddy_free_list(mm, &allocated);