From patchwork Fri Jul 17 01:42:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 51207 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A9A6222A28 for ; Fri, 17 Jul 2015 01:49:26 +0000 (UTC) Received: by lagx9 with SMTP id x9sf22539667lag.2 for ; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=5xfmLzIy863OAg5DqCgBYpY/wGwqy5H6Q4X/aoHBttA=; b=HNPlM4mXLhwjsiQ1vsk6lFNQlUcFMBo6q69SS1mqKXKUzc5gRnJ1mEMdTKIXRDwwjq XJgsD8/G5XqEIVmvw6ZUL67NJWVUNKhxYCGCorKUKm1cS4p3dALmURzTjs0eLb1LTRtI GDKB4qil88aMhWKQKNxYpgVe0Xd+3JrsikoXOg89FVjqUcZR1Sn72KcuuQyTiTDlxsoX rcASTU4pkAPUdSt4I2RkitrI67Bnzo9/IuUoPzgp8MP6ZVWjfQeSlzcEzTNL5yaqM4Yr mLeedpVRO1vHNRun37jXTE8uvrIomJwFZX+xc6phDPhf6wSIZf3d/lk166FaHvwEkmjG 7/kw== X-Gm-Message-State: ALoCoQmj+zVJ5LBScCbaOZ/CO603CjP2RNJLN2qUb4qdgzQesZHUXqAmU5mi0oKQQVFG1s0Dlw0r X-Received: by 10.113.11.3 with SMTP id ee3mr6190238lbd.9.1437097765653; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.181.34 with SMTP id dt2ls415438lac.14.gmail; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) X-Received: by 10.152.37.67 with SMTP id w3mr12073747laj.123.1437097765534; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id j1si8548942lbc.15.2015.07.16.18.49.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 18:49:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbzr7 with SMTP id zr7so53649220lbb.1 for ; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) X-Received: by 10.112.166.2 with SMTP id zc2mr12080313lbb.29.1437097765410; Thu, 16 Jul 2015 18:49:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp599331lbb; Thu, 16 Jul 2015 18:49:24 -0700 (PDT) X-Received: by 10.66.250.75 with SMTP id za11mr24277444pac.20.1437097402120; Thu, 16 Jul 2015 18:43:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id we5si15791669pac.177.2015.07.16.18.43.21; Thu, 16 Jul 2015 18:43:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbbGQBnO (ORCPT + 2 others); Thu, 16 Jul 2015 21:43:14 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:30320 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754057AbbGQBnK (ORCPT ); Thu, 16 Jul 2015 21:43:10 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t6H1h9Ve013739 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 17 Jul 2015 01:43:09 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t6H1h9X7002151 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 17 Jul 2015 01:43:09 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t6H1h6OT016505; Fri, 17 Jul 2015 01:43:06 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.127.79) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 16 Jul 2015 18:43:05 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: sasha.levin@oracle.com Subject: [PATCH 3.18 29/40] usb: gadget: f_fs: add extra check before unregister_gadget_item Date: Thu, 16 Jul 2015 21:42:32 -0400 Message-Id: <1437097363-19083-30-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437097363-19083-1-git-send-email-sasha.levin@oracle.com> References: <1437097363-19083-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Rui Miguel Silva [ Upstream commit f14e9ad17f46051b02bffffac2036486097de19e ] ffs_closed can race with configfs_rmdir which will call config_item_release, so add an extra check to avoid calling the unregister_gadget_item with an null gadget item. Signed-off-by: Rui Miguel Silva Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_fs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 63314ed..ab9b7ac 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -3400,6 +3400,7 @@ done: static void ffs_closed(struct ffs_data *ffs) { struct ffs_dev *ffs_obj; + struct f_fs_opts *opts; ENTER(); ffs_dev_lock(); @@ -3413,8 +3414,13 @@ static void ffs_closed(struct ffs_data *ffs) if (ffs_obj->ffs_closed_callback) ffs_obj->ffs_closed_callback(ffs); - if (!ffs_obj->opts || ffs_obj->opts->no_configfs - || !ffs_obj->opts->func_inst.group.cg_item.ci_parent) + if (ffs_obj->opts) + opts = ffs_obj->opts; + else + goto done; + + if (opts->no_configfs || !opts->func_inst.group.cg_item.ci_parent + || !atomic_read(&opts->func_inst.group.cg_item.ci_kref.refcount)) goto done; unregister_gadget_item(ffs_obj->opts->