From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v3 2/3] fs/nfs: copy data from rpc replies to local storage
Date: Mon, 21 Jan 2019 12:27:31 +0100 [thread overview]
Message-ID: <20190121112732.23772-2-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20190121112732.23772-1-u.kleine-koenig@pengutronix.de>
The nfs code uses data provided to the packet handler after net_poll()
returned. But the life time of this data already ended when net_poll()
returns. Most of the time it is possible to get away here but on i.MX28
the data is overwritten since commit 82ec28929cc9 ("net: fec_imx: Do not
use DMA coherent memory for Rx buffers").
So the data from the packet is copied to a malloced buffer that needs
free()ing when the data is not used any more.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
fs/nfs.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/fs/nfs.c b/fs/nfs.c
index 7695fd42ba13..fa0ab75b5609 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -440,7 +440,6 @@ again:
nfs_timer_start = get_time_ns();
nfs_state = STATE_START;
- nfs_packet = NULL;
while (nfs_state != STATE_DONE) {
if (ctrlc()) {
@@ -459,8 +458,10 @@ again:
ret = rpc_check_reply(nfs_packet, rpc_prog,
npriv->rpc_id, &nfserr);
if (!ret) {
- if (rpc_prog == PROG_NFS)
+ if (rpc_prog == PROG_NFS && nfserr) {
+ free(nfs_packet);
ret = nfserr;
+ }
break;
}
}
@@ -489,6 +490,9 @@ static int rpc_lookup_req(struct nfs_priv *npriv, uint32_t prog, uint32_t ver)
return ret;
port = ntoh32(net_read_uint32(nfs_packet + sizeof(struct rpc_reply)));
+
+ free(nfs_packet);
+
return port;
}
@@ -658,11 +662,14 @@ static int nfs_mount_req(struct nfs_priv *npriv)
if (npriv->rootfh.size > NFS3_FHSIZE) {
printf("%s: file handle too big: %lu\n", __func__,
(unsigned long)npriv->rootfh.size);
+ free(nfs_packet);
return -EIO;
}
memcpy(npriv->rootfh.data, p, npriv->rootfh.size);
p += DIV_ROUND_UP(npriv->rootfh.size, 4);
+ free(nfs_packet);
+
return 0;
}
@@ -675,6 +682,7 @@ static void nfs_umount_req(struct nfs_priv *npriv)
uint32_t *p;
int len;
int pathlen;
+ int ret;
pathlen = strlen(npriv->path);
@@ -685,7 +693,9 @@ static void nfs_umount_req(struct nfs_priv *npriv)
len = p - &(data[0]);
- rpc_req(npriv, PROG_MOUNT, MOUNT_UMOUNT, data, len);
+ ret = rpc_req(npriv, PROG_MOUNT, MOUNT_UMOUNT, data, len);
+ if (!ret)
+ free(nfs_packet);
}
/*
@@ -753,6 +763,8 @@ static int nfs_lookup_req(struct nfs_priv *npriv, struct nfs_fh *fh,
nfs_read_post_op_attr(p, inode);
+ free(nfs_packet);
+
return 0;
}
@@ -831,6 +843,7 @@ static void *nfs_readdirattr_req(struct nfs_priv *npriv, struct nfs_dir *dir)
len = nfs_packet + nfs_len - (void *)p;
if (!len) {
printf("%s: huh, no payload left\n", __func__);
+ free(nfs_packet);
return NULL;
}
@@ -838,6 +851,8 @@ static void *nfs_readdirattr_req(struct nfs_priv *npriv, struct nfs_dir *dir)
memcpy(buf, p, len);
+ free(nfs_packet);
+
xdr_init(&dir->stream, buf, len);
/* now xdr points to dirlist3 res.resok.reply */
@@ -912,11 +927,15 @@ static int nfs_read_req(struct file_priv *priv, uint64_t offset,
*/
p += 2;
- if (readlen && !rlen && !eof)
+ if (readlen && !rlen && !eof) {
+ free(nfs_packet);
return -EIO;
+ }
kfifo_put(priv->fifo, (char *)p, rlen);
+ free(nfs_packet);
+
return 0;
}
@@ -925,7 +944,7 @@ static void nfs_handler(void *ctx, char *packet, unsigned len)
char *pkt = net_eth_to_udp_payload(packet);
nfs_state = STATE_DONE;
- nfs_packet = pkt;
+ nfs_packet = xmemdup(pkt, len);
nfs_len = len;
}
@@ -992,6 +1011,8 @@ static int nfs_readlink_req(struct nfs_priv *npriv, struct nfs_fh *fh,
*target = xzalloc(len + 1);
memcpy(*target, p, len);
+ free(nfs_packet);
+
return 0;
}
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent 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 [PATCH v3 1/3] fs/nfs: don't try to set nfs error code from mount rpc call Uwe Kleine-König
2019-01-21 11:27 ` Uwe Kleine-König [this message]
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-2-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