Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp739282rdh; Sun, 24 Sep 2023 09:31:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2BYRqGU27IwiOzAUOVUUOCb8iBJBARc3ch6AHMrSDiUniVhGjtNvtrwQsR1flgQweOVdc X-Received: by 2002:a54:440c:0:b0:3a7:55f2:552d with SMTP id k12-20020a54440c000000b003a755f2552dmr5639841oiw.58.1695573073802; Sun, 24 Sep 2023 09:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695573073; cv=none; d=google.com; s=arc-20160816; b=FCX+upnkYzqpi10msmm1YstLnP2H7vnlTb9+Xw1cbV0aC3lIVy/Nn4YSVtWGzKU4r0 rLNBcx2mYrvbAKsIaoUzOwqRQ2YLlJgcaCK6fix2heVqKBlDR/Ef6Blm882r/9M6N8b4 gIUxdW6+euvSDhMZd/SOnOZlbXW/7MaWejrjNHrr873By1OX+s9tbYq67Dltgx+Fyl0a yO0ZnoIwpPpPY33rBXOERU++N/bHVxsAsqBvSJ1XnnADcDmlndo3kEsVK0sVVDuMlJZ8 R1a24H8jJ8FJ8UNn/ujPN9jel1GIAZYfx5gIzoBlZO35QUENgKa9GOtCeIoHbuDs3AMm md1A== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=+2Z6hzNWL+7AHOQl/szTVZWNb/9TMPRypWtQCppNa4Q=; fh=/vrqqZ5qtOm+wIVqFhv9HNEtRPCD1lDMpPlyD2/sMqY=; b=zpBU6JbVog1J7GchkDo7xr0HX6fCdwzU9J8qco2r4KwyUW+zUz926/XzJoNRTx3O2s 3/RES1Jfo83R6Y9Ngl33P0FnqE1eoiv+qwpe9RMEVt7txhnmXD3XsSXSPqTIdHXFiPj1 kG040myOUxQp0XRjXhqvF14iu9AXHwJEpSYBVsY+rs4EiwKOoD+0yJxvk+yjXz3ehl8N DbWzIZeMT8hI554g7/CYOmvf6IzQhXUPD/bLC5kp5S/GHWbg60nomHZQrZVcS2kCMmh+ 0W4eQF50wWYc54M4TqdsRRSpFZwa6dQdaT+WppLBjalaD6a7Q7qd3SzP9TNfjStjUKtl UMIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=XXlzUoba; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h12-20020a056a00230c00b0068ff741579fsi8558944pfh.318.2023.09.24.09.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 09:31:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=XXlzUoba; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 5AADD807DE08; Sun, 24 Sep 2023 05:45:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229450AbjIXMpl (ORCPT + 99 others); Sun, 24 Sep 2023 08:45:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbjIXMpj (ORCPT ); Sun, 24 Sep 2023 08:45:39 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.216]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5A5E3115; Sun, 24 Sep 2023 05:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=+2Z6h zNWL+7AHOQl/szTVZWNb/9TMPRypWtQCppNa4Q=; b=XXlzUobatS3E7yDcYcWPj 3Rz5JYqeyHEY8g/9dLAs2NaiSKRbsO3YwOxFEfEHWvSvnXbCq0iOnG1Z9NRFY+uM T8xqHineiXSguMS5eLDA+q/dR4+g1bH+EARi3V3AfNPgxhcJXbPNj0iyojmEBiRf zdfuEctmmJSzkR4iiV7nq0= Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by zwqz-smtp-mta-g4-3 (Coremail) with SMTP id _____wC3HGMsLxBl7_DWCw--.17004S4; Sun, 24 Sep 2023 20:44:42 +0800 (CST) From: Ma Ke To: tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] media: videobuf2: Fix IS_ERR checking in vb2_vmalloc_put_userptr() Date: Sun, 24 Sep 2023 20:44:25 +0800 Message-Id: <20230924124425.3664024-1-make_ruc2021@163.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wC3HGMsLxBl7_DWCw--.17004S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrtF1ftw18KrykCry8GrW7Jwb_yoWDJwc_uF yDX3Z7uryUWF1rtw1jka1S9ry0y3y8Wrn2gFnYy3s3J34UXa93Zw1qvw1ftF1I9a17A3sF vwn8WFyUuF43GjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRWHq7JUUUUU== X-Originating-IP: [183.174.60.14] X-CM-SenderInfo: 5pdnvshuxfjiisr6il2tof0z/1tbivg70C1Zci1ttGwAAsj X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L4,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 05:45:46 -0700 (PDT) In order to avoid error pointers from frame_vector_pages(), we could use IS_ERR() to check the return value to fix this. This checking operation could make sure that vector contains pages. Signed-off-by: Ma Ke --- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c index 7c635e292106..c37775080aff 100644 --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c @@ -134,6 +134,7 @@ static void vb2_vmalloc_put_userptr(void *buf_priv) if (!buf->vec->is_pfns) { n_pages = frame_vector_count(buf->vec); pages = frame_vector_pages(buf->vec); + BUG_ON(IS_ERR(pages)); if (vaddr) vm_unmap_ram((void *)vaddr, n_pages); if (buf->dma_dir == DMA_FROM_DEVICE || -- 2.37.2