#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 <time.h>
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_RETRY_COUNT 30
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 = 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;
} 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);
**************************************************************************/
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
* 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 */
- *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 */
**************************************************************************/
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;
- 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)
- pkt.u.call.vers = htonl(2); /* NFS v2 */
+ rpc_pkt.u.call.vers = htonl(2); /* NFS v2 */
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:
- 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)
- 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,
- (char *)&pkt, pktlen);
+ &rpc_pkt.u.data[0], pktlen);
if (rpc_prog == PROG_PORTMAP)
sport = SUNRPC_PORT;
{
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__);
- 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;
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;
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;
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("*** Warning: 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]),
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,
- 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:
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) {
+ 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;
+ 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);
}
return 0;
}
+static int nfs3_get_attributes_offset(uint32_t *data)
+{
+ if (data[1]) {
+ /* 'attributes_follow' flag is TRUE,
+ * so we have attributes on 21 dwords */
+ /* Skip unused values :
+ type; 32 bits value,
+ mode; 32 bits value,
+ nlink; 32 bits value,
+ uid; 32 bits value,
+ gid; 32 bits value,
+ size; 64 bits value,
+ used; 64 bits value,
+ rdev; 64 bits value,
+ fsid; 64 bits value,
+ fileid; 64 bits value,
+ atime; 64 bits value,
+ mtime; 64 bits value,
+ ctime; 64 bits value,
+ */
+ return 22;
+ } else {
+ /* 'attributes_follow' flag is FALSE,
+ * so we don't have any attributes */
+ return 1;
+ }
+}
+
static int nfs_readlink_reply(uchar *pkt, unsigned len)
{
struct rpc_t rpc_pkt;
int rlen;
+ int nfsv3_data_offset = 0;
debug("%s\n", __func__);
rpc_pkt.u.reply.data[0])
return -1;
- if (supported_nfs_versions & NFSV2_FLAG) {
+ if (!(supported_nfs_versions & NFSV2_FLAG)) { /* NFSV3_FLAG */
+ nfsv3_data_offset =
+ nfs3_get_attributes_offset(rpc_pkt.u.reply.data);
+ }
- rlen = ntohl(rpc_pkt.u.reply.data[1]); /* new path length */
+ /* new path length */
+ rlen = ntohl(rpc_pkt.u.reply.data[1 + nfsv3_data_offset]);
- if (*((char *)&(rpc_pkt.u.reply.data[2])) != '/') {
- int pathlen;
- strcat(nfs_path, "/");
- pathlen = strlen(nfs_path);
- memcpy(nfs_path + pathlen,
- (uchar *)&(rpc_pkt.u.reply.data[2]),
- rlen);
- nfs_path[pathlen + rlen] = 0;
- } else {
- memcpy(nfs_path,
- (uchar *)&(rpc_pkt.u.reply.data[2]),
- rlen);
- nfs_path[rlen] = 0;
- }
- } else { /* NFSV3_FLAG */
- int nfsv3_data_offset = 0;
- if (ntohl(rpc_pkt.u.reply.data[1]) != 0) {
- /* 'attributes_follow' flag is TRUE,
- * so we have attributes on 21 bytes */
- /* Skip unused values :
- type; 32 bits value,
- mode; 32 bits value,
- nlink; 32 bits value,
- uid; 32 bits value,
- gid; 32 bits value,
- size; 64 bits value,
- used; 64 bits value,
- rdev; 64 bits value,
- fsid; 64 bits value,
- fileid; 64 bits value,
- atime; 64 bits value,
- mtime; 64 bits value,
- ctime; 64 bits value,
- */
- nfsv3_data_offset = 22;
- } else {
- /* 'attributes_follow' flag is FALSE,
- * so we don't have any attributes */
- nfsv3_data_offset = 1;
- }
+ if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + rlen) > len)
+ return -NFS_RPC_DROP;
- /* new path length */
- rlen = ntohl(rpc_pkt.u.reply.data[1+nfsv3_data_offset]);
-
- if (*((char *)&(rpc_pkt.u.reply.data[2+nfsv3_data_offset])) != '/') {
- int pathlen;
- strcat(nfs_path, "/");
- pathlen = strlen(nfs_path);
- memcpy(nfs_path + pathlen,
- (uchar *)&(rpc_pkt.u.reply.data[2+nfsv3_data_offset]),
- rlen);
- nfs_path[pathlen + rlen] = 0;
- } else {
- memcpy(nfs_path,
- (uchar *)&(rpc_pkt.u.reply.data[2+nfsv3_data_offset]),
- rlen);
- nfs_path[rlen] = 0;
- }
+ if (*((char *)&(rpc_pkt.u.reply.data[2 + nfsv3_data_offset])) != '/') {
+ int pathlen;
+
+ strcat(nfs_path, "/");
+ pathlen = strlen(nfs_path);
+ memcpy(nfs_path + pathlen,
+ (uchar *)&(rpc_pkt.u.reply.data[2 + nfsv3_data_offset]),
+ rlen);
+ nfs_path[pathlen + rlen] = 0;
+ } else {
+ memcpy(nfs_path,
+ (uchar *)&(rpc_pkt.u.reply.data[2 + nfsv3_data_offset]),
+ rlen);
+ nfs_path[rlen] = 0;
}
return 0;
}
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;
rlen = ntohl(rpc_pkt.u.reply.data[18]);
data_ptr = (uchar *)&(rpc_pkt.u.reply.data[19]);
} else { /* NFSV3_FLAG */
- if (ntohl(rpc_pkt.u.reply.data[1]) != 0) {
- /* 'attributes_follow' is TRUE,
- * so we have attributes on 21 bytes */
- /* Skip unused values :
- type; 32 bits value,
- mode; 32 bits value,
- nlink; 32 bits value,
- uid; 32 bits value,
- gid; 32 bits value,
- size; 64 bits value,
- used; 64 bits value,
- rdev; 64 bits value,
- fsid; 64 bits value,
- fileid; 64 bits value,
- atime; 64 bits value,
- mtime; 64 bits value,
- ctime; 64 bits value,
- */
- rlen = ntohl(rpc_pkt.u.reply.data[23]); /* count value */
- /* Skip unused values :
- EOF: 32 bits value,
- data_size: 32 bits value,
- */
- data_ptr = (uchar *)&(rpc_pkt.u.reply.data[26]);
- } else {
- /* attributes_follow is FALSE, so we don't have any attributes */
- rlen = ntohl(rpc_pkt.u.reply.data[2]); /* count value */
- /* Skip unused values :
- EOF: 32 bits value,
- data_size: 32 bits value,
- */
- data_ptr = (uchar *)&(rpc_pkt.u.reply.data[5]);
- }
+ int nfsv3_data_offset =
+ nfs3_get_attributes_offset(rpc_pkt.u.reply.data);
+
+ /* count value */
+ rlen = ntohl(rpc_pkt.u.reply.data[1 + nfsv3_data_offset]);
+ /* Skip unused values :
+ EOF: 32 bits value,
+ data_size: 32 bits value,
+ */
+ data_ptr = (uchar *)
+ &(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;
debug("%s\n", __func__);
+ if (len > sizeof(struct rpc_t))
+ return;
+
if (dest != nfs_our_port)
return;
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");
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;
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();
}
if (nfs_path == NULL) {
net_set_state(NETLOOP_FAIL);
- puts("*** ERROR: Fail allocate memory\n");
+ printf("*** ERROR: Fail allocate memory\n");
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,
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);
struct in_addr server_net;
our_net.s_addr = net_ip.s_addr & net_netmask.s_addr;
- server_net.s_addr = net_server_ip.s_addr & net_netmask.s_addr;
+ server_net.s_addr = nfs_server_ip.s_addr & net_netmask.s_addr;
if (our_net.s_addr != server_net.s_addr)
printf("; sending through gateway %pI4",
&net_gateway);
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);
projects / oweals / u-boot.git / blobdiff