From patchwork Wed Feb 14 09:01:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 200874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1091045dyb; Wed, 14 Feb 2024 01:26:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX31L6B7ZLG6Y/98MX3nakJiTZF530aTAnyRLYWc8Ztw9u8iBvri1bG55h4O0K8sqgr16jkBiORq789rNYxVhZsL442xQ== X-Google-Smtp-Source: AGHT+IH8xKjVR1Zwh/FQE5QAJ1vL86el7s+//HjSMVisoSXkaQVhLLCs6Ka6wm0l6X0MYHCCwA9C X-Received: by 2002:a17:903:11d0:b0:1d9:e1aa:f217 with SMTP id q16-20020a17090311d000b001d9e1aaf217mr1794226plh.22.1707902815329; Wed, 14 Feb 2024 01:26:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707902815; cv=pass; d=google.com; s=arc-20160816; b=V8NBk5X8aHVw1whwqJta5Mc6jqg47fNjXGv+SezUI1xBG7G9B0OTaa/W6901RlCjrJ SIFa+zKjHaaB8kI+Lc0TKLHcDAFq0obQX38SmLrokO3AeHYKGGN4bw3XKDQ6dqq+1FC7 4wUG1r6hc51hN+UYXnapRHscE8kmlw7CgFn+otMqacYphg6C2wdk18iP+bUfk56fLgRU QKQjJOOzGlSAAV/7aFsv7tkkH4oLYw29v5pPH5lV/H7NFeY8k/l/yV/9gShykQ2cjwjj 0hrc3fvgdtYiq0lC7vvCQi/ATVdxzeDot55vd/L0jd4AWQkX/QnUa1kEDry9JgWg05ry fKtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:content-language:accept-language :message-id:date:thread-index:thread-topic:subject:cc:to:from :dkim-signature:dkim-filter; bh=a5ajpumwk1I+jMeP7Lj73hpNOSeE7RGR+9+ywHTrOTo=; fh=Se7q17z+cSXHnPWKbWKO6pyyJKYTVGPPD/ou5QLFGYM=; b=uy0fof5aJ6R5lNawdcVaIJIyXt1IgzFuiHU5lgjsNzVkNwRoZ/uxRVwYP9TymTN49v EeoPyxahm2T//XYaaiPvbMRjCDdKP20dYS8Tn1mu3OORxvAM3nWepRcB/NkocP4xK4sc Il5vmNkM0dRkIeVJT4bFdqs/QKu857oYHfMStRWub8gV1sDznxA1cH5AlH5ddDJFMwvX ZId1IepD6efR2cdT/paMU5Om9vqDnUuycfYwdZdbkQX/fupqmtEntX5SbB0Jg5wjoZon 3u9hv5/n0VjCv78LMSXIVIU73DQlqoy4nsXt2Gk6/ZpynP/L3DrCCXKgPJxyrEo+BXy1 zWzw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b="CGcJ/42F"; arc=pass (i=1 spf=pass spfdomain=infotecs.ru dkim=pass dkdomain=infotecs.ru dmarc=pass fromdomain=infotecs.ru); spf=pass (google.com: domain of linux-kernel+bounces-64923-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64923-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru X-Forwarded-Encrypted: i=2; AJvYcCWafcQqskOrAHkALdVR+WkgcNRRpSVHtmXeCSJZsjHySznHw9by2sfLzW9VB/LfjqrceOfEvyxiF3z3gru5qSpjZ5Tz2A== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id m13-20020a170902db0d00b001db4b08fbecsi1706605plx.541.2024.02.14.01.26.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 01:26:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64923-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b="CGcJ/42F"; arc=pass (i=1 spf=pass spfdomain=infotecs.ru dkim=pass dkdomain=infotecs.ru dmarc=pass fromdomain=infotecs.ru); spf=pass (google.com: domain of linux-kernel+bounces-64923-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64923-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.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 sy.mirrors.kernel.org (Postfix) with ESMTPS id A0860B28675 for ; Wed, 14 Feb 2024 09:11:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A1A1F125CF; Wed, 14 Feb 2024 09:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=infotecs.ru header.i=@infotecs.ru header.b="CGcJ/42F" Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F68379C0; Wed, 14 Feb 2024 09:10:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.244.183.115 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707901840; cv=none; b=OFk2fKEaOpspfDYgCmE2jT1FcGQcIt2d3eHD6pvByCa/T/oUCmfpcMay8vA8elZ0TdXHEfeVI+tK72eqKxezIwLxdEUpVINcE68l+fPxCoU0NxyxIJKCToreH508Ohj9rel33CPF9G0UG25i+4Lu2q56yG8wzr9VaN90jFMh8f4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707901840; c=relaxed/simple; bh=fhaQc5uReQDosB0thOz5f3cBKN3ZqzcXRvj2QlSbfMg=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=K//Ye3DZoVUdzDNyJwGf21ybWbXfjuxsaBKpmAWIBf4tUxuRIh8kKsKCQMbFORcfXiSLhVPl1hLOU1a4oSWjLuSGYOJ8bax/JN6ULDxQ9NRXPwxED0NGS0QFHe+ySQ+hhIWVDc0zsmIZfBU50j+44VYGs/Nl/D/3AZx/Noo6zyM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=infotecs.ru; spf=pass smtp.mailfrom=infotecs.ru; dkim=pass (1024-bit key) header.d=infotecs.ru header.i=@infotecs.ru header.b=CGcJ/42F; arc=none smtp.client-ip=91.244.183.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=infotecs.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=infotecs.ru Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 76927115F000; Wed, 14 Feb 2024 12:01:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 76927115F000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1707901310; bh=a5ajpumwk1I+jMeP7Lj73hpNOSeE7RGR+9+ywHTrOTo=; h=From:To:CC:Subject:Date:From; b=CGcJ/42FpqGYYm5ISrgn3MFoi4SQpwsdJWtP9fzPI4w1nPGztt3RpYS1DWWvFIVTO Ww32DsRQWnW/W9qNQA9aJ/gQEao6Bsplc3lP0HlMBfxrDHa1V1sX8INfHczCmngyGd 6CJ1MUHNMC2lVw0/2NDflooZWE0NiGgt7jtsARrk= Received: from msk-exch-01.infotecs-nt (msk-exch-01.infotecs-nt [10.0.7.191]) by mx0.infotecs-nt (Postfix) with ESMTP id 72B92310CF51; Wed, 14 Feb 2024 12:01:50 +0300 (MSK) From: Gavrilov Ilia To: Michal Ostrowski CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" , "syzbot+6bdfd184eac7709e5cc9@syzkaller.appspotmail.com" Subject: [PATCH net] pppoe: Fix memory leak in pppoe_sendmsg() Thread-Topic: [PATCH net] pppoe: Fix memory leak in pppoe_sendmsg() Thread-Index: AQHaXyRy75DQaIgJRUS4Y1xFlKXgFA== Date: Wed, 14 Feb 2024 09:01:50 +0000 Message-ID: <20240214085814.3894917-1-Ilia.Gavrilov@infotecs.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-exclaimer-md-config: 208ac3cd-1ed4-4982-a353-bdefac89ac0a Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KLMS-Rule-ID: 5 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2024/02/14 08:31:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2024/02/14 07:41:00 #23598261 X-KLMS-AntiVirus-Status: Clean, skipped X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790865902722604299 X-GMAIL-MSGID: 1790865902722604299 syzbot reports a memory leak in pppoe_sendmsg [1]. The problem is in the pppoe_recvmsg() function that handles errors in the wrong order. For the skb_recv_datagram() function, check the pointer to skb for NULL first, and then check the 'error' variable, because the skb_recv_datagram() function can set 'error' to -EAGAIN in a loop but return a correct pointer to socket buffer after a number of attempts, though 'error' remains set to -EAGAIN. skb_recv_datagram __skb_recv_datagram // Loop. if (err == -EAGAIN) then // go to the next loop iteration __skb_try_recv_datagram // if (skb != NULL) then return 'skb' // else if a signal is received then // return -EAGAIN Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with Syzkaller. Link: https://syzkaller.appspot.com/bug?extid=6bdfd184eac7709e5cc9 [1] Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: syzbot+6bdfd184eac7709e5cc9@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=6bdfd184eac7709e5cc9 Signed-off-by: Gavrilov Ilia Reviewed-by: Guillaume Nault --- drivers/net/ppp/pppoe.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 8e7238e97d0a..2ea4f4890d23 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -1007,26 +1007,21 @@ static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, struct sk_buff *skb; int error = 0; - if (sk->sk_state & PPPOX_BOUND) { - error = -EIO; - goto end; - } + if (sk->sk_state & PPPOX_BOUND) + return -EIO; skb = skb_recv_datagram(sk, flags, &error); - if (error < 0) - goto end; + if (!skb) + return error; - if (skb) { - total_len = min_t(size_t, total_len, skb->len); - error = skb_copy_datagram_msg(skb, 0, m, total_len); - if (error == 0) { - consume_skb(skb); - return total_len; - } + total_len = min_t(size_t, total_len, skb->len); + error = skb_copy_datagram_msg(skb, 0, m, total_len); + if (error == 0) { + consume_skb(skb); + return total_len; } kfree_skb(skb); -end: return error; }