2017-05-09 19:53:38

by Trond Myklebust

Subject: [PATCH] NFSv4.1: Work around a Linux server bug...

It turns out the Linux server has a bug in its implementation of
supattr_exclcreat; it returns the set of all attributes, whether
or not they are supported by minor version 1.
In order to avoid a regression, we therefore apply the supported_attrs
as a mask on top of whatever the server sent us.

Reported-by: Anna Schumaker <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/nfs4proc.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f48dfb7f3691..c08c46a3b8cd 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3268,6 +3268,7 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
.rpc_resp = &res,
};
int status;
+ int i;

bitmask[0] = FATTR4_WORD0_SUPPORTED_ATTRS |
FATTR4_WORD0_FH_EXPIRE_TYPE |
@@ -3333,8 +3334,13 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
server->cache_consistency_bitmask[0] &= FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE;
server->cache_consistency_bitmask[1] &= FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY;
server->cache_consistency_bitmask[2] = 0;
+
+ /* Avoid a regression due to buggy server */
+ for (i = 0; i < ARRAY_SIZE(res.exclcreat_bitmask); i++)
+ res.exclcreat_bitmask[i] &= res.attr_bitmask[i];
memcpy(server->exclcreat_bitmask, res.exclcreat_bitmask,
sizeof(server->exclcreat_bitmask));
+
server->acl_bitmask = res.acl_bitmask;
server->fh_expire_type = res.fh_expire_type;
}
--
2.9.3

2017-05-09 19:56:30

by Christoph Hellwig

Subject: Re: [PATCH] NFSv4.1: Work around a Linux server bug...

On Tue, May 09, 2017 at 03:53:35PM -0400, Trond Myklebust wrote:
> It turns out the Linux server has a bug in its implementation of
> supattr_exclcreat; it returns the set of all attributes, whether
> or not they are supported by minor version 1.

Are you going to send a fix?

2017-05-09 19:58:50

by Trond Myklebust

Subject: Re: [PATCH] NFSv4.1: Work around a Linux server bug...

T24gVHVlLCAyMDE3LTA1LTA5IGF0IDEyOjU2IC0wNzAwLCBDaHJpc3RvcGggSGVsbHdpZyB3cm90
ZToNCj4gT24gVHVlLCBNYXkgMDksIDIwMTcgYXQgMDM6NTM6MzVQTSAtMDQwMCwgVHJvbmQgTXlr
bGVidXN0IHdyb3RlOg0KPiA+IEl0IHR1cm5zIG91dCB0aGUgTGludXggc2VydmVyIGhhcyBhIGJ1
ZyBpbiBpdHMgaW1wbGVtZW50YXRpb24gb2YNCj4gPiBzdXBhdHRyX2V4Y2xjcmVhdDsgaXQgcmV0
dXJucyB0aGUgc2V0IG9mIGFsbCBhdHRyaWJ1dGVzLCB3aGV0aGVyDQo+ID4gb3Igbm90IHRoZXkg
YXJlIHN1cHBvcnRlZCBieSBtaW5vciB2ZXJzaW9uIDEuDQo+IA0KPiBBcmUgeW91IGdvaW5nIHRv
IHNlbmQgYSBmaXg/DQo+IA0KDQpZZXMuIEdpdmUgbWUgYSBmZXcgbW9yZSBtb21lbnRzLi4uIOKY
ug0KDQpUaGUgZXhhY3Qgc2FtZSBmaXggbmVlZHMgdG8gYmUgYXBwbGllZCBvbiB0aGUgc2VydmVy
IHNpZGUuDQotLSANClRyb25kIE15a2xlYnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVy
LCBQcmltYXJ5RGF0YQ0KdHJvbmQubXlrbGVidXN0QHByaW1hcnlkYXRhLmNvbQ0K