Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnfs: socket: use void cast to allow compile for arm32 #9685

Merged
merged 1 commit into from
Jan 14, 2025
Merged

libnfs: socket: use void cast to allow compile for arm32 #9685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions ...s/network/libnfs/patches/libnfs-514-socket-use-void-cast-to-allow-compile-for-arm32.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From a01d42a0d9682d3e506d3c78680db8c7d158fe88 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <[email protected]>
Date: Tue, 14 Jan 2025 14:09:36 +0000
Subject: [PATCH] socket: use void cast to allow compile for arm32

When compiling for arm32 the error: cast increases required alignment
of target type occurs.

/lib/socket.c: In function 'rpc_read_from_socket':
lib/socket.c:586:49: error: cast increases required alignment of target type [-Werror=cast-align]
586 | rpc->rm_xid[1] = ntohl(*(uint32_t *)&buf[0]);
| ^
lib/socket.c:587:61: error: cast increases required alignment of target type [-Werror=cast-align]
587 | rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)&buf[0]));
| ^
lib/socket.c:799:35: error: cast increases required alignment of target type [-Werror=cast-align]
799 | *((uint32_t *)rpc->inbuf) = htonl(rpc->rm_xid[1]);
| ^
lib/socket.c:861:71: error: cast increases required alignment of target type [-Werror=cast-align]
861 | const READ3res *res = (READ3res *) rpc->pdu->zdr_decode_buf;
| ^

cast via (void *) to allow the compile to suceed, as all of the source buffers should be 32bit aligned.

Signed-off-by: Rudi Heitbaum <[email protected]>
---
lib/socket.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/socket.c b/lib/socket.c
index 8f5835cc..df6f329b 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -583,8 +583,8 @@ rpc_read_from_socket(struct rpc_context *rpc)
}
if (!rpc->is_server_context) {
rpc->rm_xid[0] = count;
- rpc->rm_xid[1] = ntohl(*(uint32_t *)&buf[0]);
- rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)&buf[0]));
+ rpc->rm_xid[1] = ntohl(*(uint32_t *)(void *)&buf[0]);
+ rpc->pdu = rpc_find_pdu(rpc, ntohl(*(uint32_t *)(void *)&buf[0]));
if (rpc->pdu == NULL) {
rpc_set_error(rpc, "Failed to match incoming PDU/XID."
" Ignoring PDU");
@@ -796,7 +796,7 @@ rpc_read_from_socket(struct rpc_context *rpc)
}

/* Copy the next 4 bytes into inbuf */
- *((uint32_t *)rpc->inbuf) = htonl(rpc->rm_xid[1]);
+ *((uint32_t *)(void *)rpc->inbuf) = htonl(rpc->rm_xid[1]);

/* but set inpos to 0, we will update it above
* that we have already read these 4 bytes in
@@ -858,7 +858,7 @@ rpc_read_from_socket(struct rpc_context *rpc)
* If the READ failed, bail out here as there is no
* data.
*/
- const READ3res *res = (READ3res *) rpc->pdu->zdr_decode_buf;
+ const READ3res *res = (READ3res *)(void *) rpc->pdu->zdr_decode_buf;
if (res->status != NFS3_OK) {
goto payload_finished;
}