Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp189322pxb; Wed, 8 Sep 2021 21:35:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJpbzBonOj/D7kuO0ONJ1EoziqWhXfv61+gDElScdMQ50ZxjYA+4ctsHgIRN1rsQ1uzpLU X-Received: by 2002:a05:6638:1646:: with SMTP id a6mr1111598jat.27.1631162130752; Wed, 08 Sep 2021 21:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631162130; cv=none; d=google.com; s=arc-20160816; b=EE5Yp+PBiiFr/kW4jhrxFWKreJy2TsNYM2FufVyTJycltpa/QtBacYDLNLeuba8EVZ ztr44e7E40to+3pTOgGB9oGKvPyIOF6jbpADyXWDxAc3sSk4t2Ugkxiz+nOZA1wB8JWQ A+fF7CP38hM7VeafLcGBfc1BVDG+knDMcGUPUJEevpj44KmkLxkrAdBncNbRVnplOP+Q +42IqEcEYOXy/LkYQXJnmx3p8mDB6Yo86GUTbYP/nKBrt5y6MIubZUM8cNmY1Rk5dBWO 1tM36m+e4KLUMDriduVBwwYn7o2H6DkRiT1yvgVYw+35eaHbzc9cS40vdm34QtlzjFIj X/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=15PV/LqowfaC+fxf6vWbltb0UNQfC6jSPzN+3vijUwc=; b=0JnQQ8GhuYvHyQRVhVqzlpQ/wjw9W4kVE40/wIj81+Dni93MVkKpM2WTlcP3Oeekv+ P860CkQ0DuMnPMvQFQk7R2IQ2dHFrz3Pwqnjvi5KDM8/dWqFJ9ctUw+I7K7fRdAMEHOh BIwU6Gu7x+DF3Z/1ValWC+0i8kz5lGUl4O85uTKnBt7LHBJSHsv4jtm1HOxbTK5oSFFu 3SMIdzGdP96UHwQIon1evHarwwSbz0iCTdxagBWo3+IMqXkmM+zQ/qqbABNhprMl1HRh vL3Nv93ozs4HGFjaIfJ7SqkR1LA8cRHoQjRDnACmDwtFXkTUR9akDl7rX4e2KiWHYrNT I9mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=3DJjFnbh; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r25si573828ioh.63.2021.09.08.21.35.03; Wed, 08 Sep 2021 21:35:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=3DJjFnbh; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233035AbhIIEee (ORCPT + 99 others); Thu, 9 Sep 2021 00:34:34 -0400 Received: from zg8tmty1ljiyny4xntqumjca.icoremail.net ([165.227.154.27]:39653 "HELO zg8tmty1ljiyny4xntqumjca.icoremail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S229549AbhIIEed (ORCPT ); Thu, 9 Sep 2021 00:34:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fudan.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id; bh=15PV/LqowfaC+fxf6vWbltb0UNQfC6jSPzN+3vijUwc=; b=3 DJjFnbhsbzatVfC5kPmsEk1UPwiv7vfjI6C/y/3X8LYWTdtQ7ti4nRqk85rOC9H6 ns5IPiAoofi7djqHBlyvKC18+JSgSB9zGqSV722nckXNML5Eu3ia5qq91eYOKjlr W2pEWVmqTnuiZL6ZpFy5V5oZ6W1Tw/SRbH3kpfSGOA= Received: from localhost.localdomain (unknown [10.162.127.118]) by app1 (Coremail) with SMTP id XAUFCgCXn19pjjlhq309AA--.1163S3; Thu, 09 Sep 2021 12:32:41 +0800 (CST) From: Xiyu Yang To: Trond Myklebust , Anna Schumaker , "J. Bruce Fields" , Chuck Lever , "David S. Miller" , Jakub Kicinski , linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: yuanxzhang@fudan.edu.cn, Xiyu Yang , Xin Xiong , Xin Tan Subject: [PATCH] net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change Date: Thu, 9 Sep 2021 12:32:38 +0800 Message-Id: <1631161958-77832-1-git-send-email-xiyuyang19@fudan.edu.cn> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: XAUFCgCXn19pjjlhq309AA--.1163S3 X-Coremail-Antispam: 1UD129KBjvJXoW7WF1kAry5Kr43Gr1rKF48WFg_yoW8JFyfpr y5K34a9F98tr47G3ZrC3W0ga4jvFs8X3W5X3yI9w1kA3WDAasxGr1F9rsrWr18ArWruFW8 JF109F4ruF4DCaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9G14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1lnxkEFVAIw20F6cxK64vIFxWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I 648v4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc2xSY4AK6svPMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v2 0xvaj40_Gr0_Zr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV W8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbZmitUUUUU== X-CM-SenderInfo: irzsiiysuqikmy6i3vldqovvfxof0/ Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The refcount leak issues take place in an error handling path. When the 3rd argument buf doesn't match with "offline", "online" or "remove", the function simply returns -EINVAL and forgets to decrease the reference count of a rpc_xprt object and a rpc_xprt_switch object increased by rpc_sysfs_xprt_kobj_get_xprt() and rpc_sysfs_xprt_kobj_get_xprt_switch(), causing reference count leaks of both unused objects. Fix this issue by jumping to the error handling path labelled with out_put when buf matches none of "offline", "online" or "remove". Signed-off-by: Xiyu Yang Signed-off-by: Xin Xiong Signed-off-by: Xin Tan --- net/sunrpc/sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index 64da3bfd28e6..0cce0375107f 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -265,8 +265,10 @@ static ssize_t rpc_sysfs_xprt_state_change(struct kobject *kobj, online = 1; else if (!strncmp(buf, "remove", 6)) remove = 1; - else - return -EINVAL; + else { + count = -EINVAL; + goto out_put; + } if (wait_on_bit_lock(&xprt->state, XPRT_LOCKED, TASK_KILLABLE)) { count = -EINTR; -- 2.7.4