Skip to content

net: nfs: fix file handle length in NFSv3 #6

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

Open
Enterprise0 wants to merge 1 commit into
base: lf_v2024.04
Choose a base branch
from
Open

net: nfs: fix file handle length in NFSv3 #6

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
18 changes: 13 additions & 5 deletions net/nfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ static int nfs_offset = -1;
static int nfs_len;
static const ulong nfs_timeout = CONFIG_NFS_TIMEOUT;

static char dirfh[NFS_FHSIZE]; /* NFSv2 / NFSv3 file handle of directory */
static char dirfh[NFS3_FHSIZE]; /* NFSv2 / NFSv3 file handle of directory */
static unsigned int dirfh3_length; /* (variable) length of dirfh when NFSv3 */
static char filefh[NFS3_FHSIZE]; /* NFSv2 / NFSv3 file handle */
static unsigned int filefh3_length; /* (variable) length of filefh when NFSv3 */

Expand Down Expand Up @@ -377,9 +378,9 @@ static void nfs_lookup_req(char *fname)

rpc_req(PROG_NFS, NFS_LOOKUP, data, len);
} else { /* NFS_V3 */
*p++ = htonl(NFS_FHSIZE); /* Dir handle length */
memcpy(p, dirfh, NFS_FHSIZE);
p += (NFS_FHSIZE / 4);
*p++ = htonl(dirfh3_length); /* Dir handle length */
memcpy(p, dirfh, dirfh3_length);
p += (dirfh3_length / 4);
*p++ = htonl(fnamelen);
if (fnamelen & 3)
*(p + fnamelen / 4) = 0;
Expand Down Expand Up @@ -565,7 +566,14 @@ static int nfs_mount_reply(uchar *pkt, unsigned len)

fs_mounted = 1;
/* NFSv2 and NFSv3 use same structure */
memcpy(dirfh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
if (choosen_nfs_version != NFS_V3) {
memcpy(dirfh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
} else {
dirfh3_length = ntohl(rpc_pkt.u.reply.data[1]);
if (dirfh3_length > NFS3_FHSIZE)
dirfh3_length = NFS3_FHSIZE;
memcpy(dirfh, rpc_pkt.u.reply.data + 2, dirfh3_length);
}

return 0;
}
Expand Down