From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5498C7618D for ; Tue, 4 Apr 2023 03:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 560A36B0071; Mon, 3 Apr 2023 23:13:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50EB76B0074; Mon, 3 Apr 2023 23:13:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FDD36B0075; Mon, 3 Apr 2023 23:13:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 319226B0071 for ; Mon, 3 Apr 2023 23:13:12 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0B43C140457 for ; Tue, 4 Apr 2023 03:13:12 +0000 (UTC) X-FDA: 80642237424.08.30AA2CF Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf07.hostedemail.com (Postfix) with ESMTP id 388A840009 for ; Tue, 4 Apr 2023 03:13:08 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of jiangfeng@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=jiangfeng@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680577989; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=Wmdx+J0G3oSUIU6r3kGrlWmpbtKJTD8F9b5HS3rlS/0=; b=6vO/YrkIwJT00d/f3CVdTTEz5lKlL/YdeXQAf1d1YZgzmQoH8keMh2aq4doXH32qx0Nag4 SeVUDEqo8Z8r36ugGoHP8j9A8GAQeR7osZAUBjx93IpVlH596N/cAzKh5m0rIp4fz+T+qN kdy22MrVR9TRMBRT5b+8ALc7LVYWQ3I= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of jiangfeng@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=jiangfeng@kylinos.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680577989; a=rsa-sha256; cv=none; b=d6Sg8p+f38wJA0hzTlRbB/thZ5voKaXHx5GM20xfqXlvGG1ipfZ6k1YWqV7ArzM+lvU5En 5dq1uM2/3+eADAvgxi6F/kdORuwgBu7kvvXXQdgVp/hxVhe9v5D3ku/2eHjAfFV7qMTg9Q nXdGSS0xWUzbULhihbELq7n3s+w3Bo8= X-UUID: 8abd6cf51c9c4d14b95bb4eea84e73c4-20230404 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:f49455d1-09a9-49e1-9532-1954c1b596d7,IP:5,U RL:0,TC:0,Content:0,EDM:25,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:25 X-CID-INFO: VERSION:1.1.22,REQID:f49455d1-09a9-49e1-9532-1954c1b596d7,IP:5,URL :0,TC:0,Content:0,EDM:25,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:25 X-CID-META: VersionHash:120426c,CLOUDID:768c502a-564d-42d9-9875-7c868ee415ec,B ulkID:2304041113029BDCJM3R,BulkQuantity:0,Recheck:0,SF:38|24|17|19|44|102, TC:nil,Content:0,EDM:5,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: 8abd6cf51c9c4d14b95bb4eea84e73c4-20230404 X-User: jiangfeng@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 52235139; Tue, 04 Apr 2023 11:13:00 +0800 From: Feng Jiang To: akpm@linux-foundation.org, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Feng Jiang , Ming Xie Subject: [PATCH] selftests/mm: fix resource leaks in child_vmsplice_memcmp_fn Date: Tue, 4 Apr 2023 11:12:56 +0800 Message-Id: <20230404031256.78330-1-jiangfeng@kylinos.cn> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 388A840009 X-Stat-Signature: kr4kuknc9gwy95eeyaxtwjpk6ihgjzk6 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680577988-451917 X-HE-Meta: U2FsdGVkX1/+1In995b0ZnYYXTWoXmr3klxLxTENQu4UScgFfH9B+QQGP5EUuQI5XTHSGNmkS1zh7Gewto71o4vK8G8X0Y6vAmqyv5qAE9ww3ncKuG6kbLZH+j0Vx5db9R0PBXxap7Cxpw0QrRKhEf29qywDCjsdk6nnqNYegJXhsExHJMccu7ofZO+m5CJ7hmin3XcUWZGAKyPWGmdpCWcXPL4Ykq8VZeFC0GiyABo54RDSo3YfWr2tHfLrAmRVvTeXx2tzffHomQ8fV6BrIUN00sbuTAKBl8JAzK5Jr+mQvJapd2hHxY9RBselihDhRsq0LYyMOQJfl0lE5o5e3NXkS5yHz+I+9QcDBacw827hgcHI61tR4j7q3IpDp6jFMPykicb7ZqH9HVLmoesDyE1gUb6STZCWJ8+Fun+FDpRIsNe2b8rfMYt5ZNHOt/Ai1cevPq1mdPjROtv5Djjla7MdFSR/XpLpqU3JAc0blc5gPzxRmD5ieGeH4GOVZ34umtATJHiQTB2alMqMG8uhJcRn5ecMn6kh9aCX518JUrIRb2fkpfh7Eb1m7xdtUEISyl7j3+QaeU5aGTu3VPWiytLWSxYyWuoTZmxk1fhY9z3LxgM7VlskWL1eeO5ASMMPjNT91xTx/6hGO39K8lsW1wl/6AsT2xF4sH/ckcJhsUke3RHnQVUcG2FchGMTJWJ4H8XY53XYh64OYT8PKkOTewT1HWPXt9jNPGYr5rh1jy+KZgaVJgqc0bEbtIQgoVsMKlvQHQGxBEJn5YkHxkwqqVWP4sEPZKa2DhXRGtL1SbX6xdiCAeR5azkqLWLQRh9qKDAqJKAfIy4OMMlOZWtGffEKiTj6D2SiiIYksDqNrnC3iE8K2qt51yIIScG6QmuyAZpM2FyvjoJ3IryWQURx0MA91Af+MeZVyd53Z7FNyMdhXcWNgBkp4/SbMGJB+lOF1wZNymfliuaI02DUhCq e+9Zsl0V 3eov1fPGH1oKuzwHhoy2Vv8cNwOkoxVXN4VA9jaOaYijkfCvCUvz4/EcvUq4ZYrLZp+a2LBgyHxbMLJq6YzaY5cPbBmy27236/cKmUOAwIGKaNi8F+dfySh4UgHyTCMkKq1zsxGxCrvBYYHvggRoB/Vccww== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When the function returns, the 'new' and 'old' are not freed and the 'fds[]' are not closed, which can lead to resource leaks. Signed-off-by: Feng Jiang Suggested-by: Ming Xie --- tools/testing/selftests/mm/cow.c | 43 ++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c index c0dd2dfca51b..b8aec05d56f4 100644 --- a/tools/testing/selftests/mm/cow.c +++ b/tools/testing/selftests/mm/cow.c @@ -193,26 +193,38 @@ static int child_vmsplice_memcmp_fn(char *mem, size_t size, char *old, *new; int fds[2]; char buf; + int ret; old = malloc(size); new = malloc(size); + if (!old || !new) { + ret = -ENOMEM; + goto free; + } /* Backup the original content. */ memcpy(old, mem, size); - if (pipe(fds) < 0) - return -errno; + if (pipe(fds) < 0) { + ret = -errno; + goto free; + } /* Trigger a read-only pin. */ transferred = vmsplice(fds[1], &iov, 1, 0); - if (transferred < 0) - return -errno; - if (transferred == 0) - return -EINVAL; + if (transferred < 0) { + ret = -errno; + goto close_pipe; + } else if (transferred == 0) { + ret = -EINVAL; + goto close_pipe; + } /* Unmap it from our page tables. */ - if (munmap(mem, size) < 0) - return -errno; + if (munmap(mem, size) < 0) { + ret = -errno; + goto close_pipe; + } /* Wait until the parent modified it. */ write(comm_pipes->child_ready[1], "0", 1); @@ -222,11 +234,20 @@ static int child_vmsplice_memcmp_fn(char *mem, size_t size, /* See if we still read the old values via the pipe. */ for (total = 0; total < transferred; total += cur) { cur = read(fds[0], new + total, transferred - total); - if (cur < 0) - return -errno; + if (cur < 0) { + ret = -errno; + goto close_pipe; + } } - return memcmp(old, new, transferred); + ret = memcmp(old, new, transferred); +close_pipe: + close(fds[0]); + close(fds[1]); +free: + free(old); + free(new); + return ret; } typedef int (*child_fn)(char *mem, size_t size, struct comm_pipes *comm_pipes); -- 2.39.2