From patchwork Tue Jan 9 14:14:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 186413 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp136136dyi; Tue, 9 Jan 2024 06:15:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IF2utHW3zchPvWDNney1BLtVrEX/oWYpQNpN7BKWYAv4kmSFzXdgLvKLGPFFbqUyQbt5gCm X-Received: by 2002:a05:622a:492:b0:429:78a2:28ca with SMTP id p18-20020a05622a049200b0042978a228camr8050094qtx.68.1704809731033; Tue, 09 Jan 2024 06:15:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704809731; cv=none; d=google.com; s=arc-20160816; b=ZbXxiqfRfjEPTESPu6Jimt8LL7Kzfum9Mdss/jlqhDGYzmT48tZ4xYAo3SoxvByAEb /ep0ryewDZzGBK4sIJ5RoXGOYfVch7Z3QDoLg0dWvX60yz3EnCwxqayv5Dyd0U7fwNiB wnqUGK3uaNjmVqje+sG5xb6MyNfO46Y2H5UDE8azorGxnaRnrpX9zQ369xaEOSksGtcn b6NcZvGduMFDJWs0HNk1GKFQ6M/TA4WGAQF6DWAS/A/1+zkcUOG9jYn70hMAj0T4y8eu hGW9yc/G8Sl+17cHNnR0vDnXUO5lO5p9A14Zg2A0CpWDmG0Zbq3/OSab5WgIuWxXavjj koKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-filter; bh=XMIzVQnRbcJ5ogx4U8zN3UNWCXEPu8snS7SZ8/UXCXE=; fh=LjBR8DJ6VdrTh9+Z6Ev8AGPXq9p3NocI6R6uRbuoswM=; b=MbIjADGyXIqGTTkIV7VDuidyVEwQDeglNjB0xg9Z1bD82QIgXV7fZdS5DIweiYmUXs /Q81yNmn50tZVnA1JekBXt66XIFdb+nFc2OXuM3b/ihgKHWQi5RTcUc0iUmTJ+B6u809 WCxhY5/+m/GizGW4CFPskfhvvwTZbyEHmx199hVOWUS9Chyktfi6cLGEQKYA6D5Sm2lJ O2i3v9Kt8xOcw30xyXmJawNyq2YwRnQazz1oKm+ryR93LXvneiNaFGGVILnv2vSI0L9g 2zhZu3y8LSTUdALsu3Bd1m52YONSSpYyNLH26KOO5tpApz/hRVyGN/Q0UxOI8CVNigy4 bedQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=Vb4lgO2c; spf=pass (google.com: domain of linux-kernel+bounces-20966-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20966-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id o5-20020ac87c45000000b0042983792cfbsi2220067qtv.284.2024.01.09.06.15.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 06:15:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-20966-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=Vb4lgO2c; spf=pass (google.com: domain of linux-kernel+bounces-20966-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20966-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CF3221C242E6 for ; Tue, 9 Jan 2024 14:15:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 44EE839AEE; Tue, 9 Jan 2024 14:15:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ispras.ru header.i=@ispras.ru header.b="Vb4lgO2c" Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C9BE39AD7; Tue, 9 Jan 2024 14:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ispras.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ispras.ru Received: from localhost.ispras.ru (unknown [10.10.165.2]) by mail.ispras.ru (Postfix) with ESMTPSA id E530440737DF; Tue, 9 Jan 2024 14:14:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru E530440737DF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1704809699; bh=XMIzVQnRbcJ5ogx4U8zN3UNWCXEPu8snS7SZ8/UXCXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vb4lgO2cPqV1X86JmrbOBvMFfqjl2B4Y0cchENo4XdBEKl2zN5l2PQ3OXcwaZ7M15 qhYLbXHfYILKsFYoRd1ZImObiR+/4Z1q4dLfYOYsX+3Tup0/CgV2t+k4z+x9N1ru1q V+WEqHVHqtUhcGNUX04Z5wMUNvXM+pU0Bu/qwQGo= From: Fedor Pchelkin To: Namjae Jeon Cc: Fedor Pchelkin , Steve French , Sergey Senozhatsky , Tom Talpey , Hyunchul Lee , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org Subject: [PATCH v2] ksmbd: free ppace array on error in parse_dacl Date: Tue, 9 Jan 2024 17:14:44 +0300 Message-ID: <20240109141445.6808-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787620256350714605 X-GMAIL-MSGID: 1787622568383384839 The ppace array is not freed if one of the init_acl_state() calls inside parse_dacl() fails. At the moment the function may fail only due to the memory allocation errors so it's highly unlikely in this case but nevertheless a fix is needed. Move ppace allocation after the init_acl_state() calls with proper error handling. Found by Linux Verification Center (linuxtesting.org). Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3") Signed-off-by: Fedor Pchelkin Acked-by: Namjae Jeon --- v2: refine the patch with moving ppace allocation into another place per Namjae's suggestion; update the commit description accordingly. fs/smb/server/smbacl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c index 1164365533f0..1c9775f1efa5 100644 --- a/fs/smb/server/smbacl.c +++ b/fs/smb/server/smbacl.c @@ -401,10 +401,6 @@ static void parse_dacl(struct mnt_idmap *idmap, if (num_aces > ULONG_MAX / sizeof(struct smb_ace *)) return; - ppace = kmalloc_array(num_aces, sizeof(struct smb_ace *), GFP_KERNEL); - if (!ppace) - return; - ret = init_acl_state(&acl_state, num_aces); if (ret) return; @@ -414,6 +410,13 @@ static void parse_dacl(struct mnt_idmap *idmap, return; } + ppace = kmalloc_array(num_aces, sizeof(struct smb_ace *), GFP_KERNEL); + if (!ppace) { + free_acl_state(&default_acl_state); + free_acl_state(&acl_state); + return; + } + /* * reset rwx permissions for user/group/other. * Also, if num_aces is 0 i.e. DACL has no ACEs,