From patchwork Mon Sep 28 21:36:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 7281011 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B030B9F32B for ; Mon, 28 Sep 2015 21:41:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E54802071A for ; Mon, 28 Sep 2015 21:41:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A97F20718 for ; Mon, 28 Sep 2015 21:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753567AbbI1VlQ (ORCPT ); Mon, 28 Sep 2015 17:41:16 -0400 Received: from mail-qk0-f172.google.com ([209.85.220.172]:34053 "EHLO mail-qk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308AbbI1VlP (ORCPT ); Mon, 28 Sep 2015 17:41:15 -0400 Received: by qkfq186 with SMTP id q186so73924474qkf.1 for ; Mon, 28 Sep 2015 14:41:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fblFhaRrwg9zDhi3KEp07/gx6lZ73jWPdXfjj1rM7pM=; b=ilnuwFix9xTxFEXURjDO4M7cMnLqRy/SxzjEl2lvaHrfJ0Dbc4zCY1JMn1izqGapoD jxK3DvZrSMyBz3jR1rxDJuESEsmubTDpgQP0776k3aeYEflS6EZfVljeWYmjv+DzxKf6 ANk+YcA3I/1Fr5MqA1v4EuEDIEgBvt9wS50zh82+bTNITRsXtWv10wenUdrT7mdepzPR 6kvJS5/u+OBx0A5Qupu1lyoRP1w9r0GzRpZ9gmYeQogUuniUZqwSvVio039ltFXnkMWT YM7kAcZ+Zi++YYUDvoXkBFvY8kl6ZleiqQzcQZ4wT5/mtiPpq5idvtBsslZaUtdHHbnz VvKw== X-Gm-Message-State: ALoCoQkU6S+uo931w6EIXuV2a8fyLuZ3ucWKT55n0X9F/+eaF+0iDDEVesMYXG46AWhSETQLh7NE X-Received: by 10.55.209.196 with SMTP id o65mr10150587qkl.98.1443476474668; Mon, 28 Sep 2015 14:41:14 -0700 (PDT) Received: from localhost.localdomain ([190.2.108.156]) by smtp.gmail.com with ESMTPSA id i124sm7910491qhc.12.2015.09.28.14.41.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Sep 2015 14:41:13 -0700 (PDT) From: Ezequiel Garcia To: Cc: Hans Verkuil , Ezequiel Garcia Subject: [PATCH] vivid: Fix iteration in driver removal path Date: Mon, 28 Sep 2015 18:36:51 -0300 Message-Id: <1443476211-20212-1-git-send-email-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.5.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the diver is removed and all the resources are deallocated, we should be iterating through the created devices only. Currently, the iteration ends when vivid_devs[i] is NULL. Since the array contains VIVID_MAX_DEVS elements, it will oops if n_devs=VIVID_MAX_DEVS because in that case, no element is NULL. Fixes: c88a96b023d8 ('[media] vivid: add core driver code') Signed-off-by: Ezequiel Garcia --- drivers/media/platform/vivid/vivid-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index a047b4716741..0f5e9143cc7e 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -1341,8 +1341,11 @@ static int vivid_remove(struct platform_device *pdev) struct vivid_dev *dev; unsigned i; - for (i = 0; vivid_devs[i]; i++) { + + for (i = 0; i < n_devs; i++) { dev = vivid_devs[i]; + if (!dev) + continue; if (dev->has_vid_cap) { v4l2_info(&dev->v4l2_dev, "unregistering %s\n",