Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2174074pxb; Fri, 25 Mar 2022 12:24:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZQqDWzwlJ50wKoNaLemlM5B5vPf50NXWcwnmjmh8yoJn0In5pDdBGARAqh1U6s4WdJoO2 X-Received: by 2002:a63:d4:0:b0:398:9cd:64dc with SMTP id 203-20020a6300d4000000b0039809cd64dcmr860988pga.193.1648236296819; Fri, 25 Mar 2022 12:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648236296; cv=none; d=google.com; s=arc-20160816; b=luw4pNeLEdKjBGJ9HYhk+erkUJXf4IG1lXNPmE9+Z/fdeJ1HbblxYbaRkHEs+PW7ja yCbSTv71zZcuvFNO09Uz+CB3wVsZ7oGHjqW2CJK/aGbc0fkYbPlUPqMhBEBGiFFSN9AM P4zklTQk3elpUV6acl+QzwTSRQPwbeC6IMQdKRerkn0QFZ1ZnCL3qO5y6kGKs/PNO7U+ /DoZIuqX+wJibWvWpk4LLZ80MEJfnv6dgjpRFIYP7khyjuwnXBZJBv7iqBed1zyzU6/j JDMpf/oYae8a9fSyMnhsKYLjDj88jRnlG7sTHmCH0j65EpZFkF7bdCGCLT7dIx5cUNJh LJGg== 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=JOdw52tIcP1ycJ2Xf5FaLmk1taNnPOqo0qWdlHPWydI=; b=rsHRFY11UWeAuqx233tJHpEEW8E9+q5wQcq3XO189ej8MuT4vuNdzXiz6UIRJFI+dK m2n27MFY7ALEDIbnFHI0XEmw26U2PmUkI+B2wmYloQEHqOEip1bHBrEVsWr5/rkygKOs 59S2kJ0JhU+xzEOSbaw2GVH5EowPxQQWlhOBg/qMx3sfxV5t7HqqWjdTthu5fHrfqdnP GBUcIruuosEB1Wtd9vsnyhsLLCi6erMNpy8KJoLCSrdTvfOYbbOhY3eVqBtm6P8fwYik piy69JVEaVNOXrw0lFK7HiXQmXNFx0r9AlWU8/RL04JkmQWV/8tRwRXoWUgiH7BkWs+g 9fzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qvn/Grcz"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id c20-20020a63d514000000b003816043f042si3183206pgg.567.2022.03.25.12.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qvn/Grcz"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3A0DA293E61; Fri, 25 Mar 2022 11:33:10 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346107AbiCYPct (ORCPT + 99 others); Fri, 25 Mar 2022 11:32:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376342AbiCYPWH (ORCPT ); Fri, 25 Mar 2022 11:22:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1AC06C93F; Fri, 25 Mar 2022 08:16:21 -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 dfw.source.kernel.org (Postfix) with ESMTPS id AD54360AE0; Fri, 25 Mar 2022 15:15:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4069C340E9; Fri, 25 Mar 2022 15:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1648221354; bh=PVvpZe0gwx7cCv7/Tokda8oeLwGKuYAWw5qH3QerL9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qvn/GrczFNU1b47SvZkOXh61ieUfwNDdAGOx3/9kAIP9dSJurGaCfe1PwLf4rhPMH tV1DeHtmUmy/Z9F1baJTCSsIeNNwwLKGyOrI4gDEgMllE/eTJcbSOhwyk4RIBi9DRu UTrc1UZFRMafB3nDwK9gSAy5/zcNCnx/DIRL7IgM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roberto Sassu , syzbot+e9072e90624a31dfa85f@syzkaller.appspotmail.com, Gerd Hoffmann Subject: [PATCH 5.15 30/37] drm/virtio: Ensure that objs is not NULL in virtio_gpu_array_put_free() Date: Fri, 25 Mar 2022 16:14:31 +0100 Message-Id: <20220325150420.791591767@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325150419.931802116@linuxfoundation.org> References: <20220325150419.931802116@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=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Roberto Sassu commit 6b79f96f4a23846516e5e6e4dd37fc06f43a60dd upstream. If virtio_gpu_object_shmem_init() fails (e.g. due to fault injection, as it happened in the bug report by syzbot), virtio_gpu_array_put_free() could be called with objs equal to NULL. Ensure that objs is not NULL in virtio_gpu_array_put_free(), or otherwise return from the function. Cc: stable@vger.kernel.org # 5.13.x Signed-off-by: Roberto Sassu Reported-by: syzbot+e9072e90624a31dfa85f@syzkaller.appspotmail.com Fixes: 377f8331d0565 ("drm/virtio: fix possible leak/unlock virtio_gpu_object_array") Link: http://patchwork.freedesktop.org/patch/msgid/20211213183122.838119-1-roberto.sassu@huawei.com Signed-off-by: Gerd Hoffmann Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/virtio/virtgpu_gem.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -248,6 +248,9 @@ void virtio_gpu_array_put_free(struct vi { u32 i; + if (!objs) + return; + for (i = 0; i < objs->nents; i++) drm_gem_object_put(objs->objs[i]); virtio_gpu_array_free(objs);