mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-27 09:12:44 +00:00
- Given that we tell the compiler that struct ip is packed and 32-bit
aligned, GCC 4.2.1 also generates code for sendudp() that assumes this alignment. GCC 4.2.1 however doesn't 32-bit align wbuf, causing the loader to crash due to an unaligned access of wbuf in sendudp() when netbooting sparc64. Solve this by specifying wbuf as packed and 32-bit aligned, too. As for lastdata and readudp() this currently is no issue when compiled with GCC 4.2.1, though give lastdata the same treatment as wbuf for consistency and possibility of being affected in the future. - Sprinkle const on a lookup table. Approved by: re (kensmith)
This commit is contained in:
parent
3525d10497
commit
7a5ebe41f2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/7/; revision=173094
@ -95,10 +95,10 @@ struct tftp_handle {
|
||||
u_char header[HEADER_SIZE];
|
||||
struct tftphdr t;
|
||||
u_char space[RSPACE];
|
||||
} lastdata;
|
||||
} __packed __aligned(4) lastdata;
|
||||
};
|
||||
|
||||
static int tftperrors[8] = {
|
||||
static const int tftperrors[8] = {
|
||||
0, /* ??? */
|
||||
ENOENT,
|
||||
EPERM,
|
||||
@ -175,7 +175,7 @@ tftp_makereq(h)
|
||||
u_char header[HEADER_SIZE];
|
||||
struct tftphdr t;
|
||||
u_char space[FNAME_SIZE + 6];
|
||||
} wbuf;
|
||||
} __packed __aligned(4) wbuf;
|
||||
char *wtail;
|
||||
int l;
|
||||
ssize_t res;
|
||||
@ -218,7 +218,7 @@ tftp_getnextblock(h)
|
||||
struct {
|
||||
u_char header[HEADER_SIZE];
|
||||
struct tftphdr t;
|
||||
} wbuf;
|
||||
} __packed __aligned(4) wbuf;
|
||||
char *wtail;
|
||||
int res;
|
||||
struct tftphdr *t;
|
||||
|
Loading…
Reference in New Issue
Block a user