projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
net
/
nfs.c
diff --git
a/net/nfs.c
b/net/nfs.c
index 08bdd92d8020d92b511fffec7081c4030233f1d8..72e1018a3bdd54a01038e5ef2ef6e56fff9461ae 100644
(file)
--- a/
net/nfs.c
+++ b/
net/nfs.c
@@
-28,11
+28,14
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
+#include <flash.h>
+#include <image.h>
#include <net.h>
#include <malloc.h>
#include <mapmem.h>
#include "nfs.h"
#include "bootp.h"
#include <net.h>
#include <malloc.h>
#include <mapmem.h>
#include "nfs.h"
#include "bootp.h"
+#include <time.h>
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_RETRY_COUNT 30
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_RETRY_COUNT 30
@@
-86,14
+89,15
@@
static inline int store_block(uchar *src, unsigned offset, unsigned len)
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
/* start address in flash? */
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
/* start address in flash? */
- if (load_addr + offset >= flash_info[i].start[0]) {
+ if (
image_
load_addr + offset >= flash_info[i].start[0]) {
rc = 1;
break;
}
}
if (rc) { /* Flash is destination for this packet */
rc = 1;
break;
}
}
if (rc) { /* Flash is destination for this packet */
- rc = flash_write((uchar *)src, (ulong)(load_addr+offset), len);
+ rc = flash_write((uchar *)src, (ulong)image_load_addr + offset,
+ len);
if (rc) {
flash_perror(rc);
return -1;
if (rc) {
flash_perror(rc);
return -1;
@@
-101,7
+105,7
@@
static inline int store_block(uchar *src, unsigned offset, unsigned len)
} else
#endif /* CONFIG_SYS_DIRECT_FLASH_NFS */
{
} else
#endif /* CONFIG_SYS_DIRECT_FLASH_NFS */
{
- void *ptr = map_sysmem(load_addr + offset, len);
+ void *ptr = map_sysmem(
image_
load_addr + offset, len);
memcpy(ptr, src, len);
unmap_sysmem(ptr);
memcpy(ptr, src, len);
unmap_sysmem(ptr);
@@
-142,13
+146,6
@@
RPC_ADD_CREDENTIALS - Add RPC authentication/verifier entries
**************************************************************************/
static uint32_t *rpc_add_credentials(uint32_t *p)
{
**************************************************************************/
static uint32_t *rpc_add_credentials(uint32_t *p)
{
- int hl;
- int hostnamelen;
- char hostname[256];
-
- strcpy(hostname, "");
- hostnamelen = strlen(hostname);
-
/* Here's the executive summary on authentication requirements of the
* various NFS server implementations: Linux accepts both AUTH_NONE
* and AUTH_UNIX authentication (also accepts an empty hostname field
/* Here's the executive summary on authentication requirements of the
* various NFS server implementations: Linux accepts both AUTH_NONE
* and AUTH_UNIX authentication (also accepts an empty hostname field
@@
-158,17
+155,11
@@
static uint32_t *rpc_add_credentials(uint32_t *p)
* it (if the BOOTP/DHCP reply didn't give one, just use an empty
* hostname). */
* it (if the BOOTP/DHCP reply didn't give one, just use an empty
* hostname). */
- hl = (hostnamelen + 3) & ~3;
-
/* Provide an AUTH_UNIX credential. */
*p++ = htonl(1); /* AUTH_UNIX */
/* Provide an AUTH_UNIX credential. */
*p++ = htonl(1); /* AUTH_UNIX */
- *p++ = htonl(hl+20); /* auth length */
- *p++ = htonl(0); /* stamp */
- *p++ = htonl(hostnamelen); /* hostname string */
- if (hostnamelen & 3)
- *(p + hostnamelen / 4) = 0; /* add zero padding */
- memcpy(p, hostname, hostnamelen);
- p += hl / 4;
+ *p++ = htonl(20); /* auth length */
+ *p++ = 0; /* stamp */
+ *p++ = 0; /* hostname string */
*p++ = 0; /* uid */
*p++ = 0; /* gid */
*p++ = 0; /* auxiliary gid list */
*p++ = 0; /* uid */
*p++ = 0; /* gid */
*p++ = 0; /* auxiliary gid list */
@@
-185,39
+176,39
@@
RPC_LOOKUP - Lookup RPC Port numbers
**************************************************************************/
static void rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
{
**************************************************************************/
static void rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
{
- struct rpc_t pkt;
+ struct rpc_t
rpc_
pkt;
unsigned long id;
uint32_t *p;
int pktlen;
int sport;
id = ++rpc_id;
unsigned long id;
uint32_t *p;
int pktlen;
int sport;
id = ++rpc_id;
- pkt.u.call.id = htonl(id);
- pkt.u.call.type = htonl(MSG_CALL);
-
pkt.u.call.rpcvers = htonl(2);
/* use RPC version 2 */
- pkt.u.call.prog = htonl(rpc_prog);
+
rpc_
pkt.u.call.id = htonl(id);
+
rpc_
pkt.u.call.type = htonl(MSG_CALL);
+
rpc_pkt.u.call.rpcvers = htonl(2);
/* use RPC version 2 */
+
rpc_
pkt.u.call.prog = htonl(rpc_prog);
switch (rpc_prog) {
case PROG_NFS:
if (supported_nfs_versions & NFSV2_FLAG)
switch (rpc_prog) {
case PROG_NFS:
if (supported_nfs_versions & NFSV2_FLAG)
-
pkt.u.call.vers = htonl(2);
/* NFS v2 */
+
rpc_pkt.u.call.vers = htonl(2);
/* NFS v2 */
else /* NFSV3_FLAG */
else /* NFSV3_FLAG */
-
pkt.u.call.vers = htonl(3);
/* NFS v3 */
+
rpc_pkt.u.call.vers = htonl(3);
/* NFS v3 */
break;
case PROG_PORTMAP:
case PROG_MOUNT:
default:
break;
case PROG_PORTMAP:
case PROG_MOUNT:
default:
-
pkt.u.call.vers = htonl(2);
/* portmapper is version 2 */
+
rpc_pkt.u.call.vers = htonl(2);
/* portmapper is version 2 */
}
}
- pkt.u.call.proc = htonl(rpc_proc);
- p =
(uint32_t *)&(pkt.u.call.data)
;
+
rpc_
pkt.u.call.proc = htonl(rpc_proc);
+ p =
rpc_pkt.u.call.data
;
if (datalen)
if (datalen)
- memcpy(
(char *)p, (char *)data, datalen*
sizeof(uint32_t));
+ memcpy(
p, data, datalen *
sizeof(uint32_t));
- pktlen = (char *)p + datalen
*sizeof(uint32_t) - (char *)&
pkt;
+ pktlen = (char *)p + datalen
* sizeof(uint32_t) - (char *)&rpc_
pkt;
memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
-
(char *)&pkt
, pktlen);
+
&rpc_pkt.u.data[0]
, pktlen);
if (rpc_prog == PROG_PORTMAP)
sport = SUNRPC_PORT;
if (rpc_prog == PROG_PORTMAP)
sport = SUNRPC_PORT;
@@
-445,7
+436,7
@@
static int rpc_lookup_reply(int prog, uchar *pkt, unsigned len)
{
struct rpc_t rpc_pkt;
{
struct rpc_t rpc_pkt;
- memcpy(
(unsigned char *)&rpc_pkt
, pkt, len);
+ memcpy(
&rpc_pkt.u.data[0]
, pkt, len);
debug("%s\n", __func__);
debug("%s\n", __func__);
@@
-477,7
+468,7
@@
static int nfs_mount_reply(uchar *pkt, unsigned len)
debug("%s\n", __func__);
debug("%s\n", __func__);
- memcpy(
(unsigned char *)&rpc_pkt
, pkt, len);
+ memcpy(
&rpc_pkt.u.data[0]
, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
@@
-503,7
+494,7
@@
static int nfs_umountall_reply(uchar *pkt, unsigned len)
debug("%s\n", __func__);
debug("%s\n", __func__);
- memcpy(
(unsigned char *)&rpc_pkt
, pkt, len);
+ memcpy(
&rpc_pkt.u.data[0]
, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
@@
-527,7
+518,7
@@
static int nfs_lookup_reply(uchar *pkt, unsigned len)
debug("%s\n", __func__);
debug("%s\n", __func__);
- memcpy(
(unsigned char *)&rpc_pkt
, pkt, len);
+ memcpy(
&rpc_pkt.u.data[0]
, pkt, len);
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
@@
-546,7
+537,7
@@
static int nfs_lookup_reply(uchar *pkt, unsigned len)
switch (ntohl(rpc_pkt.u.reply.data[0])) {
/* Minimal supported NFS version */
case 3:
switch (ntohl(rpc_pkt.u.reply.data[0])) {
/* Minimal supported NFS version */
case 3:
- debug("*** Waring: NFS version not supported: Requested: V%d, accepted: min V%d - max V%d\n",
+ debug("*** War
n
ing: NFS version not supported: Requested: V%d, accepted: min V%d - max V%d\n",
(supported_nfs_versions & NFSV2_FLAG) ?
2 : 3,
ntohl(rpc_pkt.u.reply.data[0]),
(supported_nfs_versions & NFSV2_FLAG) ?
2 : 3,
ntohl(rpc_pkt.u.reply.data[0]),
@@
-557,11
+548,13
@@
static int nfs_lookup_reply(uchar *pkt, unsigned len)
return -NFS_RPC_PROG_MISMATCH;
case 4:
default:
return -NFS_RPC_PROG_MISMATCH;
case 4:
default:
- printf("*** ERROR: NFS version not supported: Requested: V%d, accepted: min V%d - max V%d\n",
- (supported_nfs_versions & NFSV2_FLAG) ?
+ puts("*** ERROR: NFS version not supported");
+ debug(": Requested: V%d, accepted: min V%d - max V%d\n",
+ (supported_nfs_versions & NFSV2_FLAG) ?
2 : 3,
2 : 3,
- ntohl(rpc_pkt.u.reply.data[0]),
- ntohl(rpc_pkt.u.reply.data[1]));
+ ntohl(rpc_pkt.u.reply.data[0]),
+ ntohl(rpc_pkt.u.reply.data[1]));
+ puts("\n");
}
break;
case NFS_RPC_PROG_UNAVAIL:
}
break;
case NFS_RPC_PROG_UNAVAIL:
@@
-569,19
+562,23
@@
static int nfs_lookup_reply(uchar *pkt, unsigned len)
case NFS_RPC_GARBAGE_ARGS:
case NFS_RPC_SYSTEM_ERR:
default: /* Unknown error on 'accept state' flag */
case NFS_RPC_GARBAGE_ARGS:
case NFS_RPC_SYSTEM_ERR:
default: /* Unknown error on 'accept state' flag */
-
printf
("*** ERROR: accept state error (%d)\n",
-
ntohl(rpc_pkt.u.reply.astatus));
+
debug
("*** ERROR: accept state error (%d)\n",
+ ntohl(rpc_pkt.u.reply.astatus));
break;
}
return -1;
}
if (supported_nfs_versions & NFSV2_FLAG) {
break;
}
return -1;
}
if (supported_nfs_versions & NFSV2_FLAG) {
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + NFS_FHSIZE) > len)
+ return -NFS_RPC_DROP;
memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
} else { /* NFSV3_FLAG */
filefh3_length = ntohl(rpc_pkt.u.reply.data[1]);
if (filefh3_length > NFS3_FHSIZE)
filefh3_length = NFS3_FHSIZE;
memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);
} else { /* NFSV3_FLAG */
filefh3_length = ntohl(rpc_pkt.u.reply.data[1]);
if (filefh3_length > NFS3_FHSIZE)
filefh3_length = NFS3_FHSIZE;
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + filefh3_length) > len)
+ return -NFS_RPC_DROP;
memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length);
}
memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length);
}
@@
-590,9
+587,9
@@
static int nfs_lookup_reply(uchar *pkt, unsigned len)
static int nfs3_get_attributes_offset(uint32_t *data)
{
static int nfs3_get_attributes_offset(uint32_t *data)
{
- if (
ntohl(data[1]) != 0
) {
+ if (
data[1]
) {
/* 'attributes_follow' flag is TRUE,
/* 'attributes_follow' flag is TRUE,
- * so we have attributes on 21
byte
s */
+ * so we have attributes on 21
dword
s */
/* Skip unused values :
type; 32 bits value,
mode; 32 bits value,
/* Skip unused values :
type; 32 bits value,
mode; 32 bits value,
@@
-645,6
+642,9
@@
static int nfs_readlink_reply(uchar *pkt, unsigned len)
/* new path length */
rlen = ntohl(rpc_pkt.u.reply.data[1 + nfsv3_data_offset]);
/* new path length */
rlen = ntohl(rpc_pkt.u.reply.data[1 + nfsv3_data_offset]);
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + rlen) > len)
+ return -NFS_RPC_DROP;
+
if (*((char *)&(rpc_pkt.u.reply.data[2 + nfsv3_data_offset])) != '/') {
int pathlen;
if (*((char *)&(rpc_pkt.u.reply.data[2 + nfsv3_data_offset])) != '/') {
int pathlen;
@@
-671,7
+671,7
@@
static int nfs_read_reply(uchar *pkt, unsigned len)
debug("%s\n", __func__);
debug("%s\n", __func__);
- memcpy(
(uchar *)&rpc_pkt
, pkt, sizeof(rpc_pkt.u.reply));
+ memcpy(
&rpc_pkt.u.data[0]
, pkt, sizeof(rpc_pkt.u.reply));
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
if (ntohl(rpc_pkt.u.reply.id) > rpc_id)
return -NFS_RPC_ERR;
@@
-712,6
+712,9
@@
static int nfs_read_reply(uchar *pkt, unsigned len)
&(rpc_pkt.u.reply.data[4 + nfsv3_data_offset]);
}
&(rpc_pkt.u.reply.data[4 + nfsv3_data_offset]);
}
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + rlen) > len)
+ return -9999;
+
if (store_block(data_ptr, nfs_offset, rlen))
return -9999;
if (store_block(data_ptr, nfs_offset, rlen))
return -9999;
@@
-743,6
+746,9
@@
static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,
debug("%s\n", __func__);
debug("%s\n", __func__);
+ if (len > sizeof(struct rpc_t))
+ return;
+
if (dest != nfs_our_port)
return;
if (dest != nfs_our_port)
return;
@@
-781,7
+787,7
@@
static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,
if (reply == -NFS_RPC_DROP) {
break;
} else if (reply == -NFS_RPC_ERR) {
if (reply == -NFS_RPC_DROP) {
break;
} else if (reply == -NFS_RPC_ERR) {
-
puts
("*** ERROR: Cannot umount\n");
+
debug
("*** ERROR: Cannot umount\n");
net_set_state(NETLOOP_FAIL);
} else {
puts("\ndone\n");
net_set_state(NETLOOP_FAIL);
} else {
puts("\ndone\n");
@@
-833,6
+839,8
@@
static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,
case STATE_READ_REQ:
rlen = nfs_read_reply(pkt, len);
case STATE_READ_REQ:
rlen = nfs_read_reply(pkt, len);
+ if (rlen == -NFS_RPC_DROP)
+ break;
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
if (rlen > 0) {
nfs_offset += rlen;
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
if (rlen > 0) {
nfs_offset += rlen;
@@
-845,7
+853,7
@@
static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,
if (!rlen)
nfs_download_state = NETLOOP_SUCCESS;
if (rlen < 0)
if (!rlen)
nfs_download_state = NETLOOP_SUCCESS;
if (rlen < 0)
-
printf
("NFS READ error (%d)\n", rlen);
+
debug
("NFS READ error (%d)\n", rlen);
nfs_state = STATE_UMOUNT_REQ;
nfs_send();
}
nfs_state = STATE_UMOUNT_REQ;
nfs_send();
}
@@
-864,11
+872,12
@@
void nfs_start(void)
if (nfs_path == NULL) {
net_set_state(NETLOOP_FAIL);
if (nfs_path == NULL) {
net_set_state(NETLOOP_FAIL);
- p
uts
("*** ERROR: Fail allocate memory\n");
+ p
rintf
("*** ERROR: Fail allocate memory\n");
return;
}
return;
}
- if (net_boot_file_name[0] == '\0') {
+ if (!net_parse_bootfile(&nfs_server_ip, nfs_path,
+ sizeof(nfs_path_buff))) {
sprintf(nfs_path, "/nfsroot/%02X%02X%02X%02X.img",
net_ip.s_addr & 0xFF,
(net_ip.s_addr >> 8) & 0xFF,
sprintf(nfs_path, "/nfsroot/%02X%02X%02X%02X.img",
net_ip.s_addr & 0xFF,
(net_ip.s_addr >> 8) & 0xFF,
@@
-877,18
+886,6
@@
void nfs_start(void)
printf("*** Warning: no boot file name; using '%s'\n",
nfs_path);
printf("*** Warning: no boot file name; using '%s'\n",
nfs_path);
- } else {
- char *p = net_boot_file_name;
-
- p = strchr(p, ':');
-
- if (p != NULL) {
- nfs_server_ip = string_to_ip(net_boot_file_name);
- ++p;
- strcpy(nfs_path, p);
- } else {
- strcpy(nfs_path, net_boot_file_name);
- }
}
nfs_filename = basename(nfs_path);
}
nfs_filename = basename(nfs_path);
@@
-905,7
+902,7
@@
void nfs_start(void)
struct in_addr server_net;
our_net.s_addr = net_ip.s_addr & net_netmask.s_addr;
struct in_addr server_net;
our_net.s_addr = net_ip.s_addr & net_netmask.s_addr;
- server_net.s_addr = n
et
_server_ip.s_addr & net_netmask.s_addr;
+ server_net.s_addr = n
fs
_server_ip.s_addr & net_netmask.s_addr;
if (our_net.s_addr != server_net.s_addr)
printf("; sending through gateway %pI4",
&net_gateway);
if (our_net.s_addr != server_net.s_addr)
printf("; sending through gateway %pI4",
&net_gateway);
@@
-917,8
+914,7
@@
void nfs_start(void)
net_boot_file_expected_size_in_blocks << 9);
print_size(net_boot_file_expected_size_in_blocks << 9, "");
}
net_boot_file_expected_size_in_blocks << 9);
print_size(net_boot_file_expected_size_in_blocks << 9, "");
}
- printf("\nLoad address: 0x%lx\n"
- "Loading: *\b", load_addr);
+ printf("\nLoad address: 0x%lx\nLoading: *\b", image_load_addr);
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
net_set_udp_handler(nfs_handler);
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
net_set_udp_handler(nfs_handler);