Patch "ocfs2: Fix use of slab data with sendpage" has been added to the 6.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    ocfs2: Fix use of slab data with sendpage

to the 6.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ocfs2-fix-use-of-slab-data-with-sendpage.patch
and it can be found in the queue-6.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 69074108621c294f220b9c1e5ea026045f5567ed
Author: David Howells <dhowells@xxxxxxxxxx>
Date:   Fri Jun 23 23:55:10 2023 +0100

    ocfs2: Fix use of slab data with sendpage
    
    [ Upstream commit 86d7bd6e66e9925f0f04a7bcf3c92c05fdfefb5a ]
    
    ocfs2 uses kzalloc() to allocate buffers for o2net_hand, o2net_keep_req and
    o2net_keep_resp and then passes these to sendpage.  This isn't really
    allowed as the lifetime of slab objects is not controlled by page ref -
    though in this case it will probably work.  sendmsg() with MSG_SPLICE_PAGES
    will, however, print a warning and give an error.
    
    Fix it to use folio_alloc() instead to allocate a buffer for the handshake
    message, keepalive request and reply messages.
    
    Fixes: 98211489d414 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem")
    Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
    cc: Mark Fasheh <mark@xxxxxxxxxx>
    cc: Kurt Hackel <kurt.hackel@xxxxxxxxxx>
    cc: Joel Becker <jlbec@xxxxxxxxxxxx>
    cc: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
    cc: ocfs2-devel@xxxxxxxxxxxxxx
    Link: https://lore.kernel.org/r/20230623225513.2732256-14-dhowells@xxxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index aecbd712a00cf..929a1133bc180 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -2087,18 +2087,24 @@ void o2net_stop_listening(struct o2nm_node *node)
 
 int o2net_init(void)
 {
+	struct folio *folio;
+	void *p;
 	unsigned long i;
 
 	o2quo_init();
-
 	o2net_debugfs_init();
 
-	o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
-	o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
-	o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
-	if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp)
+	folio = folio_alloc(GFP_KERNEL | __GFP_ZERO, 0);
+	if (!folio)
 		goto out;
 
+	p = folio_address(folio);
+	o2net_hand = p;
+	p += sizeof(struct o2net_handshake);
+	o2net_keep_req = p;
+	p += sizeof(struct o2net_msg);
+	o2net_keep_resp = p;
+
 	o2net_hand->protocol_version = cpu_to_be64(O2NET_PROTOCOL_VERSION);
 	o2net_hand->connector_id = cpu_to_be64(1);
 
@@ -2124,9 +2130,6 @@ int o2net_init(void)
 	return 0;
 
 out:
-	kfree(o2net_hand);
-	kfree(o2net_keep_req);
-	kfree(o2net_keep_resp);
 	o2net_debugfs_exit();
 	o2quo_exit();
 	return -ENOMEM;
@@ -2135,8 +2138,6 @@ int o2net_init(void)
 void o2net_exit(void)
 {
 	o2quo_exit();
-	kfree(o2net_hand);
-	kfree(o2net_keep_req);
-	kfree(o2net_keep_resp);
 	o2net_debugfs_exit();
+	folio_put(virt_to_folio(o2net_hand));
 }



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux