net/af_iucv: fix virtual vs physical address confusion
authorAlexander Gordeev <agordeev@linux.ibm.com>
Thu, 15 Feb 2024 08:05:00 +0000 (09:05 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Feb 2024 02:28:13 +0000 (18:28 -0800)
Fix virtual vs physical address confusion. This does not fix a bug
since virtual and physical address spaces are currently the same.

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Link: https://lore.kernel.org/r/20240215080500.2616848-1-agordeev@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/iucv/af_iucv.c

index 498a0c3..4aa1c72 100644 (file)
@@ -1060,13 +1060,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,
                        int i;
 
                        /* skip iucv_array lying in the headroom */
-                       iba[0].address = (u32)(addr_t)skb->data;
+                       iba[0].address = (u32)virt_to_phys(skb->data);
                        iba[0].length = (u32)skb_headlen(skb);
                        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                               iba[i + 1].address =
-                                       (u32)(addr_t)skb_frag_address(frag);
+                               iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
                                iba[i + 1].length = (u32)skb_frag_size(frag);
                        }
                        err = pr_iucv->message_send(iucv->path, &txmsg,
@@ -1162,13 +1161,12 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb,
                        struct iucv_array *iba = (struct iucv_array *)skb->head;
                        int i;
 
-                       iba[0].address = (u32)(addr_t)skb->data;
+                       iba[0].address = (u32)virt_to_phys(skb->data);
                        iba[0].length = (u32)skb_headlen(skb);
                        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                               iba[i + 1].address =
-                                       (u32)(addr_t)skb_frag_address(frag);
+                               iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
                                iba[i + 1].length = (u32)skb_frag_size(frag);
                        }
                        rc = pr_iucv->message_receive(path, msg,