From patchwork Fri Oct 30 15:24:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11870081 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 634D492C for ; Fri, 30 Oct 2020 15:24:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39E8D22249 for ; Fri, 30 Oct 2020 15:24:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TnUxV9MK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbgJ3PYZ (ORCPT ); Fri, 30 Oct 2020 11:24:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23588 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbgJ3PYZ (ORCPT ); Fri, 30 Oct 2020 11:24:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604071464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QwLkawJq9ox4OkwlI6rcfvvTwI6YSYml8hrmWz5QMs4=; b=TnUxV9MKIOduVA/Int5hEZGTivMXa/he+ASzYUyD6KVB3700lhsUcGY8m433xfT8/xGxIK SV0/L2JJze7RzAmS9hlb39IjaF7OdZxIJM+zwxa+wutxPFiYE6TkM4ooO2CnCzmpu4Y8Nm y0dNpbl4wpULYASQUCKT9iH4XgSqEJM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-265-KjTXOrOBOp6_ImkjQbGxcg-1; Fri, 30 Oct 2020 11:24:22 -0400 X-MC-Unique: KjTXOrOBOp6_ImkjQbGxcg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B6A58F62E8; Fri, 30 Oct 2020 15:24:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-66-212.rdu2.redhat.com [10.10.66.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D231109F192; Fri, 30 Oct 2020 15:24:17 +0000 (UTC) From: Qian Cai To: Jens Axboe Cc: Alexander Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] fs: Fix memory leaks in do_renameat2() error paths Date: Fri, 30 Oct 2020 11:24:07 -0400 Message-Id: <20201030152407.43598-1-cai@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org We will need to call putname() before do_renameat2() returning -EINVAL to avoid memory leaks. Fixes: 3c5499fa56f5 ("fs: make do_renameat2() take struct filename") Signed-off-by: Qian Cai --- fs/namei.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 27f5a4e025fd..9dc5e1b139c9 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -4362,11 +4362,11 @@ int do_renameat2(int olddfd, struct filename *oldname, int newdfd, int error; if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) - return -EINVAL; + goto out; if ((flags & (RENAME_NOREPLACE | RENAME_WHITEOUT)) && (flags & RENAME_EXCHANGE)) - return -EINVAL; + goto out; if (flags & RENAME_EXCHANGE) target_flags = 0; @@ -4486,6 +4486,14 @@ int do_renameat2(int olddfd, struct filename *oldname, int newdfd, } exit: return error; +out: + if (!IS_ERR(oldname)) + putname(oldname); + + if (!IS_ERR(newname)) + putname(newname); + + return -EINVAL; } SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,