From patchwork Mon Oct 24 11:27:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp463373wru; Mon, 24 Oct 2022 06:47:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6KM6k2gU16eYQOAUKysXPswx2l/cqWCGbpUOjYqoZ97FDob+15YIxjYAXxUhrFrHkIReRZ X-Received: by 2002:a05:6402:510d:b0:45d:a888:d831 with SMTP id m13-20020a056402510d00b0045da888d831mr30226423edd.315.1666619265402; Mon, 24 Oct 2022 06:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619265; cv=none; d=google.com; s=arc-20160816; b=Lbb+r8QC09pJI2wkyXrSh49lHownX8CtGAomHBovksyLAEgiJibbFoH6d1Shnp/Qw+ nqpygTi7XN7ly9fIp7AdQiXFJt/zcsK0iFBtF3N+Yx1tsNP3IMPVk+pvYIGKwucfF0gF plbyx6sT0RjT8ZctC3Tjn7D4kBXTXKRbDMlNzxzqNGOr975lLkaYtob8QfEh23wC9ywp Qaa5VSDfBCpuQRKSD/CK4bS5kVTUisaVbw6ypIDPdfWp4qKJx/D7wWN7fEx3glwsF8H1 4ZnGweUPFY4HTs3tB9zsC0Y5baoQFnD+VFGenxjoAYx16QBLWWD7s6DjXXCAiRNbzCef AwHQ== 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=9NV/ihc0Uh1gmyJpr61Y3yKDSmVXX5AfKL+sPrj3NMw=; b=LJ6uxNE+fNi3I8F+IWUNFsuS/z2AgVl1FWIIsLcvOgCgWJmZ4HZpf2CYSuAHUIi+Bl f13bJExWhg7zP3q608ybyMUps0HKPPOUB8Zhaofsl4y7A2EvhvyQxXJD1ICDkIu/Pl0x yAhuNVGKhyKRXwDO4zD5hXOb/Uc/+r4/9oFI0uiBYLhCel87E08it1vbr6DXnexXQ8Bc YU+bX+4FyVaMUEPzh0edeuqabjzOfTMKDRaFBk03cRJNZRAspbIWZBL1LbWocNyyWavF eK+FVezf3cz8FQlsL/W79k2OOKFzKNE/BJfUCeE88ZEHV/DWEPcwbJ3N6UUXh4Jmb+/4 VQcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="YwhioM/2"; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bh11-20020a170906a0cb00b0078d1dc1b64csi23070056ejb.170.2022.10.24.06.47.19; Mon, 24 Oct 2022 06:47:45 -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="YwhioM/2"; 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 S236270AbiJXNp7 (ORCPT + 99 others); Mon, 24 Oct 2022 09:45:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236417AbiJXNoL (ORCPT ); Mon, 24 Oct 2022 09:44:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAE332BE2F; Mon, 24 Oct 2022 05:40:08 -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 7E52061345; Mon, 24 Oct 2022 12:38:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88AA7C433C1; Mon, 24 Oct 2022 12:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615098; bh=BMhRM4nqWbjmRpKYBjSHNb+WOA6zO/H96SN3tqK7YGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YwhioM/21g5sm/yzcDulbZpsIrks8bUuNhERB1BiZxqnzgWTtK/teiNXtjM1G73X2 NTF26zgx7Zb47EHJDCJQ0vHzl5yCXl2/uSXwW4CY6U2SY8t3bRBy8q787XMbsOkB7n vRVCmBnThXAZ+NvDzlEmwh7Wz4XGrK5FhQaHDRKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Dufresne , Dmitry Osipenko , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.15 121/530] media: cedrus: Fix endless loop in cedrus_h265_skip_bits() Date: Mon, 24 Oct 2022 13:27:45 +0200 Message-Id: <20221024113050.527524218@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747576962885269997?= X-GMAIL-MSGID: =?utf-8?q?1747576962885269997?= From: Dmitry Osipenko commit 91db7a3fc7fe670cf1770a398a43bb4a1f776bf1 upstream. The busy status bit may never de-assert if number of programmed skip bits is incorrect, resulting in a kernel hang because the bit is polled endlessly in the code. Fix it by adding timeout for the bit-polling. This problem is reproducible by setting the data_bit_offset field of the HEVC slice params to a wrong value by userspace. Cc: stable@vger.kernel.org Fixes: 7678c5462680 (media: cedrus: Fix decoding for some HEVC videos) Reported-by: Nicolas Dufresne Signed-off-by: Dmitry Osipenko Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c @@ -234,8 +234,9 @@ static void cedrus_h265_skip_bits(struct cedrus_write(dev, VE_DEC_H265_TRIGGER, VE_DEC_H265_TRIGGER_FLUSH_BITS | VE_DEC_H265_TRIGGER_TYPE_N_BITS(tmp)); - while (cedrus_read(dev, VE_DEC_H265_STATUS) & VE_DEC_H265_STATUS_VLD_BUSY) - udelay(1); + + if (cedrus_wait_for(dev, VE_DEC_H265_STATUS, VE_DEC_H265_STATUS_VLD_BUSY)) + dev_err_ratelimited(dev->dev, "timed out waiting to skip bits\n"); count += tmp; }