linux-kernel - linux-next: manual merge of the vfs tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri, 1 Jun 2018 11:52:14 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the vfs tree with Linus' tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/afs/fsclient.c

between commit:

  684b0f68cf1c ("afs: Fix AFSFetchStatus decoder to provide OpenAFS compatibility")

from Linus' tree and commit:

  c875c76a061d ("afs: Fix a Sparse warning in xdr_decode_AFSFetchStatus()")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/afs/fsclient.c
index b273e1d60478,b695d9e16c65..000000000000
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@@ -138,37 -137,14 +138,31 @@@ static int xdr_decode_AFSFetchStatus(st
  	u64 data_version, size;
  	u32 type, abort_code;
  	u8 flags = 0;
- 	int ret;
- 
- 	if (vnode)
- 		write_seqlock(&vnode->cb_lock);
  
 +	abort_code = ntohl(xdr->abort_code);
 +
  	if (xdr->if_version != htonl(AFS_FSTATUS_VERSION)) {
 +		if (xdr->if_version == htonl(0) &&
 +		    abort_code != 0 &&
 +		    inline_error) {
 +			/* The OpenAFS fileserver has a bug in FS.InlineBulkStatus
 +			 * whereby it doesn't set the interface version in the error
 +			 * case.
 +			 */
 +			status->abort_code = abort_code;
- 			ret = 0;
- 			goto out;
++			return 0;
 +		}
 +
  		pr_warn("Unknown AFSFetchStatus version %u\n", ntohl(xdr->if_version));
  		goto bad;
  	}
  
 +	if (abort_code != 0 && inline_error) {
 +		status->abort_code = abort_code;
- 		ret = 0;
- 		goto out;
++		return 0;
 +	}
 +
  	type = ntohl(xdr->type);
 -	abort_code = ntohl(xdr->abort_code);
  	switch (type) {
  	case AFS_FTYPE_FILE:
  	case AFS_FTYPE_DIR:

Content of type "application/pgp-signature" skipped