From patchwork Sun May 18 18:05:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4198661 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E522A9F32A for ; Sun, 18 May 2014 18:05:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB8D320260 for ; Sun, 18 May 2014 18:05:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 067342022D for ; Sun, 18 May 2014 18:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751065AbaERSFZ (ORCPT ); Sun, 18 May 2014 14:05:25 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:57326 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbaERSFY (ORCPT ); Sun, 18 May 2014 14:05:24 -0400 Received: by mail-ig0-f176.google.com with SMTP id hl10so2631732igb.3 for ; Sun, 18 May 2014 11:05:24 -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=3LeI1Ruz/DE344JT+R2PZnbOxoh9BXGp1Ywwh/sehGA=; b=fHUAOs2+0C93rlsnSajfJVLVHIwqVXjbYjOb9hu7ksb13iS4Vb/EJ96VK/HxA6HZXN EXiMNz6PT0mBp4cASccmpiz+zgboMLmupv1DgZrN7RrJI+e+Xt8C/bWH6pDBBcaneBRG EGfDsiIrfhgn6EHiGNAZ3iEWk4+IQR78R3RJ1soBkzWRtVB+V2ExdmIEuR2uWTVLmKnK t5PRShsbGBLGuxee9YksmxUMLfU3U6rSYvlNmKWkNypp4O/z1GmNy/TPxvSIITH9XJ0U 4451CExPkfHjcL2ryepBk7BzY2UT/Cyp56JZK8j21fmdhUeBdAfa/bIEvnTexi9HdTTh fw1A== X-Gm-Message-State: ALoCoQkQS5JBSO6eMHTLnTrQyLKpTJlek6qJNROJLyiweX/8RjGOwvhi6v/snYRSsp8ncGCkte72 X-Received: by 10.50.46.100 with SMTP id u4mr11562211igm.23.1400436324293; Sun, 18 May 2014 11:05:24 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-5-70.drr02.mskg.mi.frontiernet.net. [50.124.5.70]) by mx.google.com with ESMTPSA id w4sm14840260igl.7.2014.05.18.11.05.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 May 2014 11:05:23 -0700 (PDT) From: Trond Myklebust To: Bruce Fields Cc: linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: Fix a module reference leak in svc_handle_xprt Date: Sun, 18 May 2014 14:05:22 -0400 Message-Id: <1400436322-5014-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 If the accept() call fails, we need to put the module reference. Signed-off-by: Trond Myklebust --- net/sunrpc/svc_xprt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 06c6ff0cb911..a4acaf2bcf18 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -730,6 +730,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt) newxpt = xprt->xpt_ops->xpo_accept(xprt); if (newxpt) svc_add_new_temp_xprt(serv, newxpt); + else + module_put(xprt->xpt_class->xcl_owner); } else if (xprt->xpt_ops->xpo_has_wspace(xprt)) { /* XPT_DATA|XPT_DEFERRED case: */ dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",