Commit 9eda38dc authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Jakub Kicinski

net/af_iucv: fix virtual vs physical address confusion

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: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Link: https://lore.kernel.org/r/20240215080500.2616848-1-agordeev@linux.ibm.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fecc5155
...@@ -1060,13 +1060,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg, ...@@ -1060,13 +1060,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,
int i; int i;
/* skip iucv_array lying in the headroom */ /* 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); iba[0].length = (u32)skb_headlen(skb);
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
iba[i + 1].address = iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
(u32)(addr_t)skb_frag_address(frag);
iba[i + 1].length = (u32)skb_frag_size(frag); iba[i + 1].length = (u32)skb_frag_size(frag);
} }
err = pr_iucv->message_send(iucv->path, &txmsg, err = pr_iucv->message_send(iucv->path, &txmsg,
...@@ -1162,13 +1161,12 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb, ...@@ -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; struct iucv_array *iba = (struct iucv_array *)skb->head;
int i; 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); iba[0].length = (u32)skb_headlen(skb);
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
iba[i + 1].address = iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
(u32)(addr_t)skb_frag_address(frag);
iba[i + 1].length = (u32)skb_frag_size(frag); iba[i + 1].length = (u32)skb_frag_size(frag);
} }
rc = pr_iucv->message_receive(path, msg, rc = pr_iucv->message_receive(path, msg,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment