Skip to content

Commit a73588f

Browse files
jhershbejhershbe
committed
Revert "net: nfs: Use the tx buffer to construct rpc msgs"
This reverts commit 998372b. This caused a data abort on some platform. Signed-off-by: Joe Hershberger <[email protected]> Reported-by: Guillaume GARDET <[email protected]>
1 parent 16f4166 commit a73588f

File tree

1 file changed

+43
-45
lines changed

1 file changed

+43
-45
lines changed

‎net/nfs.c

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -170,41 +170,41 @@ static uint32_t *rpc_add_credentials(uint32_t *p)
170170
/**************************************************************************
171171
RPC_LOOKUP - Lookup RPC Port numbers
172172
**************************************************************************/
173-
static struct rpc_t *rpc_req_prep(void)
174-
{
175-
return (struct rpc_t *)(net_tx_packet + net_eth_hdr_size() +
176-
IP_UDP_HDR_SIZE);
177-
}
178-
179-
static void rpc_req(int rpc_prog, int rpc_proc, struct rpc_t *rpc_pkt,
180-
int datalen)
173+
static void rpc_req(int rpc_prog, int rpc_proc, uint32_t *data, int datalen)
181174
{
175+
struct rpc_t rpc_pkt;
182176
unsigned long id;
177+
uint32_t *p;
183178
int pktlen;
184179
int sport;
185180

186181
id = ++rpc_id;
187-
rpc_pkt->u.call.id = htonl(id);
188-
rpc_pkt->u.call.type = htonl(MSG_CALL);
189-
rpc_pkt->u.call.rpcvers = htonl(2); /* use RPC version 2 */
190-
rpc_pkt->u.call.prog = htonl(rpc_prog);
182+
rpc_pkt.u.call.id = htonl(id);
183+
rpc_pkt.u.call.type = htonl(MSG_CALL);
184+
rpc_pkt.u.call.rpcvers = htonl(2); /* use RPC version 2 */
185+
rpc_pkt.u.call.prog = htonl(rpc_prog);
191186
switch (rpc_prog) {
192187
case PROG_NFS:
193188
if (supported_nfs_versions & NFSV2_FLAG)
194-
rpc_pkt->u.call.vers = htonl(2); /* NFS v2 */
189+
rpc_pkt.u.call.vers = htonl(2); /* NFS v2 */
195190
else /* NFSV3_FLAG */
196-
rpc_pkt->u.call.vers = htonl(3); /* NFS v3 */
191+
rpc_pkt.u.call.vers = htonl(3); /* NFS v3 */
197192
break;
198193
case PROG_PORTMAP:
199194
case PROG_MOUNT:
200195
default:
201-
/* portmapper is version 2 */
202-
rpc_pkt->u.call.vers = htonl(2);
196+
rpc_pkt.u.call.vers = htonl(2); /* portmapper is version 2 */
203197
}
204-
rpc_pkt->u.call.proc = htonl(rpc_proc);
198+
rpc_pkt.u.call.proc = htonl(rpc_proc);
199+
p = (uint32_t *)&(rpc_pkt.u.call.data);
200+
201+
if (datalen)
202+
memcpy((char *)p, (char *)data, datalen*sizeof(uint32_t));
203+
204+
pktlen = (char *)p + datalen * sizeof(uint32_t) - (char *)&rpc_pkt;
205205

206-
pktlen = ((char *)&rpc_pkt->u.call.data - (char *)&rpc_pkt) +
207-
datalen * sizeof(uint32_t);
206+
memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
207+
&rpc_pkt.u.data[0], pktlen);
208208

209209
if (rpc_prog == PROG_PORTMAP)
210210
sport = SUNRPC_PORT;
@@ -222,32 +222,30 @@ RPC_LOOKUP - Lookup RPC Port numbers
222222
**************************************************************************/
223223
static void rpc_lookup_req(int prog, int ver)
224224
{
225-
uint32_t *data;
226-
struct rpc_t *rpc_pkt = rpc_req_prep();
225+
uint32_t data[16];
227226

228-
data = rpc_pkt->u.call.data;
229227
data[0] = 0; data[1] = 0; /* auth credential */
230228
data[2] = 0; data[3] = 0; /* auth verifier */
231229
data[4] = htonl(prog);
232230
data[5] = htonl(ver);
233231
data[6] = htonl(17); /* IP_UDP */
234232
data[7] = 0;
235-
rpc_req(PROG_PORTMAP, PORTMAP_GETPORT, rpc_pkt, 8);
233+
rpc_req(PROG_PORTMAP, PORTMAP_GETPORT, data, 8);
236234
}
237235

238236
/**************************************************************************
239237
NFS_MOUNT - Mount an NFS Filesystem
240238
**************************************************************************/
241239
static void nfs_mount_req(char *path)
242240
{
241+
uint32_t data[1024];
243242
uint32_t *p;
244243
int len;
245244
int pathlen;
246-
struct rpc_t *rpc_pkt = rpc_req_prep();
247245

248246
pathlen = strlen(path);
249247

250-
p = rpc_pkt->u.call.data;
248+
p = &(data[0]);
251249
p = rpc_add_credentials(p);
252250

253251
*p++ = htonl(pathlen);
@@ -256,30 +254,30 @@ static void nfs_mount_req(char *path)
256254
memcpy(p, path, pathlen);
257255
p += (pathlen + 3) / 4;
258256

259-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
257+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
260258

261-
rpc_req(PROG_MOUNT, MOUNT_ADDENTRY, rpc_pkt, len);
259+
rpc_req(PROG_MOUNT, MOUNT_ADDENTRY, data, len);
262260
}
263261

264262
/**************************************************************************
265263
NFS_UMOUNTALL - Unmount all our NFS Filesystems on the Server
266264
**************************************************************************/
267265
static void nfs_umountall_req(void)
268266
{
267+
uint32_t data[1024];
269268
uint32_t *p;
270269
int len;
271-
struct rpc_t *rpc_pkt = rpc_req_prep();
272270

273271
if ((nfs_server_mount_port == -1) || (!fs_mounted))
274272
/* Nothing mounted, nothing to umount */
275273
return;
276274

277-
p = rpc_pkt->u.call.data;
275+
p = &(data[0]);
278276
p = rpc_add_credentials(p);
279277

280-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
278+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
281279

282-
rpc_req(PROG_MOUNT, MOUNT_UMOUNTALL, rpc_pkt, len);
280+
rpc_req(PROG_MOUNT, MOUNT_UMOUNTALL, data, len);
283281
}
284282

285283
/***************************************************************************
@@ -291,11 +289,11 @@ static void nfs_umountall_req(void)
291289
**************************************************************************/
292290
static void nfs_readlink_req(void)
293291
{
292+
uint32_t data[1024];
294293
uint32_t *p;
295294
int len;
296-
struct rpc_t *rpc_pkt = rpc_req_prep();
297295

298-
p = rpc_pkt->u.call.data;
296+
p = &(data[0]);
299297
p = rpc_add_credentials(p);
300298

301299
if (supported_nfs_versions & NFSV2_FLAG) {
@@ -307,24 +305,24 @@ static void nfs_readlink_req(void)
307305
p += (filefh3_length / 4);
308306
}
309307

310-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
308+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
311309

312-
rpc_req(PROG_NFS, NFS_READLINK, rpc_pkt, len);
310+
rpc_req(PROG_NFS, NFS_READLINK, data, len);
313311
}
314312

315313
/**************************************************************************
316314
NFS_LOOKUP - Lookup Pathname
317315
**************************************************************************/
318316
static void nfs_lookup_req(char *fname)
319317
{
318+
uint32_t data[1024];
320319
uint32_t *p;
321320
int len;
322321
int fnamelen;
323-
struct rpc_t *rpc_pkt = rpc_req_prep();
324322

325323
fnamelen = strlen(fname);
326324

327-
p = rpc_pkt->u.call.data;
325+
p = &(data[0]);
328326
p = rpc_add_credentials(p);
329327

330328
if (supported_nfs_versions & NFSV2_FLAG) {
@@ -336,9 +334,9 @@ static void nfs_lookup_req(char *fname)
336334
memcpy(p, fname, fnamelen);
337335
p += (fnamelen + 3) / 4;
338336

339-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
337+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
340338

341-
rpc_req(PROG_NFS, NFS_LOOKUP, rpc_pkt, len);
339+
rpc_req(PROG_NFS, NFS_LOOKUP, data, len);
342340
} else { /* NFSV3_FLAG */
343341
*p++ = htonl(NFS_FHSIZE); /* Dir handle length */
344342
memcpy(p, dirfh, NFS_FHSIZE);
@@ -349,9 +347,9 @@ static void nfs_lookup_req(char *fname)
349347
memcpy(p, fname, fnamelen);
350348
p += (fnamelen + 3) / 4;
351349

352-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
350+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
353351

354-
rpc_req(PROG_NFS, NFS3PROC_LOOKUP, rpc_pkt, len);
352+
rpc_req(PROG_NFS, NFS3PROC_LOOKUP, data, len);
355353
}
356354
}
357355

@@ -360,11 +358,11 @@ NFS_READ - Read File on NFS Server
360358
**************************************************************************/
361359
static void nfs_read_req(int offset, int readlen)
362360
{
361+
uint32_t data[1024];
363362
uint32_t *p;
364363
int len;
365-
struct rpc_t *rpc_pkt = rpc_req_prep();
366364

367-
p = rpc_pkt->u.call.data;
365+
p = &(data[0]);
368366
p = rpc_add_credentials(p);
369367

370368
if (supported_nfs_versions & NFSV2_FLAG) {
@@ -383,9 +381,9 @@ static void nfs_read_req(int offset, int readlen)
383381
*p++ = 0;
384382
}
385383

386-
len = (uint32_t *)p - (uint32_t *)&(rpc_pkt->u.call.data);
384+
len = (uint32_t *)p - (uint32_t *)&(data[0]);
387385

388-
rpc_req(PROG_NFS, NFS_READ, rpc_pkt, len);
386+
rpc_req(PROG_NFS, NFS_READ, data, len);
389387
}
390388

391389
/**************************************************************************

0 commit comments

Comments
 (0)