Attachment 192123 Details for Bug 227214 – Fix OpenDowngrade to clear bits defined for NFSv4.1 that were not in NFSv4.0

[patch] Fix OpenDowngrade to clear bits defined for NFSv4.1 that were not in NFSv4.0

opendowngrade.patch (text/plain), 999 bytes, created by Rick Macklem on 2018-04-02 22:04:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2018-04-02 22:04:07 UTC

Size: 999 bytes

patch

obsolete

>--- fs/nfsserver/nfs_nfsdserv.c.sav3	2018-03-29 22:18:50.337556000 -0400
>+++ fs/nfsserver/nfs_nfsdserv.c	2018-03-29 22:23:23.935173000 -0400
>@@ -3251,6 +3251,8 @@ nfsrvd_opendowngrade(struct nfsrv_descri
> 	tl += (NFSX_STATEIDOTHER / NFSX_UNSIGNED);
> 	stp->ls_seq = fxdr_unsigned(u_int32_t, *tl++);
> 	i = fxdr_unsigned(int, *tl++);
>+	if ((nd->nd_flag & ND_NFSV41) != 0)
>+		i &= ~NFSV4OPEN_WANTDELEGMASK;
> 	switch (i) {
> 	case NFSV4OPEN_ACCESSREAD:
> 		stp->ls_flags = (NFSLCK_READACCESS | NFSLCK_DOWNGRADE);
>@@ -3263,7 +3265,7 @@ nfsrvd_opendowngrade(struct nfsrv_descri
> 		    NFSLCK_DOWNGRADE);
> 		break;
> 	default:
>-		nd->nd_repstat = NFSERR_BADXDR;
>+		nd->nd_repstat = NFSERR_INVAL;
> 	}
> 	i = fxdr_unsigned(int, *tl);
> 	switch (i) {
>@@ -3279,7 +3281,7 @@ nfsrvd_opendowngrade(struct nfsrv_descri
> 		stp->ls_flags |= (NFSLCK_READDENY | NFSLCK_WRITEDENY);
> 		break;
> 	default:
>-		nd->nd_repstat = NFSERR_BADXDR;
>+		nd->nd_repstat = NFSERR_INVAL;
> 	}
> 
> 	clientid.lval[0] = stp->ls_stateid.other[0];

Actions: View | Diff

Attachments on bug 227214: 192123 | 192667