From: Coly Li <colyli@suse.de>
To: davem@davemloft.net, linux-block@vger.kernel.org,
linux-nvme@lists.infradead.org, netdev@vger.kernel.org,
open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
ceph-devel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Coly Li <colyli@suse.de>,
Eric Dumazet <eric.dumazet@gmail.com>,
Vasily Averin <vvs@virtuozzo.com>,
stable@vger.kernel.org
Subject: [PATCH v10 4/7] tcp: use sendpage_ok() to detect misused .sendpage
Date: Fri, 2 Oct 2020 16:27:31 +0800 [thread overview]
Message-ID: <20201002082734.13925-5-colyli@suse.de> (raw)
In-Reply-To: <20201002082734.13925-1-colyli@suse.de>
commit a10674bf2406 ("tcp: detecting the misuse of .sendpage for Slab
objects") adds the checks for Slab pages, but the pages don't have
page_count are still missing from the check.
Network layer's sendpage method is not designed to send page_count 0
pages neither, therefore both PageSlab() and page_count() should be
both checked for the sending page. This is exactly what sendpage_ok()
does.
This patch uses sendpage_ok() in do_tcp_sendpages() to detect misused
.sendpage, to make the code more robust.
Fixes: a10674bf2406 ("tcp: detecting the misuse of .sendpage for Slab objects")
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Coly Li <colyli@suse.de>
Cc: Vasily Averin <vvs@virtuozzo.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: stable@vger.kernel.org
---
net/ipv4/tcp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 31f3b858db81..2135ee7c806d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -970,7 +970,8 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
long timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
if (IS_ENABLED(CONFIG_DEBUG_VM) &&
- WARN_ONCE(PageSlab(page), "page must not be a Slab one"))
+ WARN_ONCE(!sendpage_ok(page),
+ "page must not be a Slab one and have page_count > 0"))
return -EINVAL;
/* Wait for a connection to finish. One exception is TCP Fast Open
--
2.26.2
next prev parent reply other threads:[~2020-10-02 8:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 8:27 [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
2020-10-02 8:27 ` [PATCH v10 1/7] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li
2020-10-02 8:27 ` [PATCH v10 2/7] net: add WARN_ONCE in kernel_sendpage() for improper zero-copy send Coly Li
2020-10-02 8:27 ` [PATCH v10 3/7] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() Coly Li
2020-10-02 8:27 ` Coly Li [this message]
2020-10-02 8:27 ` [PATCH v10 5/7] drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage() Coly Li
2020-10-02 8:27 ` [PATCH v10 6/7] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map() Coly Li
2020-10-02 8:27 ` [PATCH v10 7/7] libceph: use sendpage_ok() in ceph_tcp_sendpage() Coly Li
2020-10-02 22:28 ` [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers David Miller
2020-10-03 10:42 ` Coly Li
2020-10-04 3:38 ` [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201002082734.13925-5-colyli@suse.de \
--to=colyli@suse.de \
--cc=ceph-devel@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=open-iscsi@googlegroups.com \
--cc=stable@vger.kernel.org \
--cc=vvs@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).