From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v3 1/3] fs/nfs: don't try to set nfs error code from mount rpc call
Date: Mon, 21 Jan 2019 12:27:30 +0100 [thread overview]
Message-ID: <20190121112732.23772-1-u.kleine-koenig@pengutronix.de> (raw)
A packet from a mount rpc call doesn't have an NFS error field, so don't
try to access this.
In the case of the MOUNT_UMOUNT procedure the reply package is short
such that accessing the u32 after the rpc_reply structure is already
after the end of the packet. Apart from the access to out-of-packet data
there is no harm because the wrongly read value is unused. But make this
more explicit by only using nfserr if the call was an NFS request.
Fixes: 9ede56ad2476 ("fs: Add NFS support")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
fs/nfs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/nfs.c b/fs/nfs.c
index d7f156687fc9..7695fd42ba13 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -382,7 +382,7 @@ static int rpc_check_reply(unsigned char *pkt,
return -EINVAL;
}
- if (rpc_prog == PROG_PORTMAP)
+ if (rpc_prog != PROG_NFS)
return 0;
data = (uint32_t *)(pkt + sizeof(struct rpc_reply));
@@ -459,7 +459,8 @@ again:
ret = rpc_check_reply(nfs_packet, rpc_prog,
npriv->rpc_id, &nfserr);
if (!ret) {
- ret = nfserr;
+ if (rpc_prog == PROG_NFS)
+ ret = nfserr;
break;
}
}
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2019-01-21 11:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 11:27 Uwe Kleine-König [this message]
2019-01-21 11:27 ` [PATCH v3 2/3] fs/nfs: copy data from rpc replies to local storage Uwe Kleine-König
2019-01-21 11:27 ` [PATCH v3 3/3] fs/nfs: stop using a global variable for nfs packet payload Uwe Kleine-König
2019-01-22 7:25 ` [PATCH v3 1/3] fs/nfs: don't try to set nfs error code from mount rpc call Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190121112732.23772-1-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox