linux-kernel - linux-next: manual merge of the vfs tree with the v9fs 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20150407140506.387fedcb@canb.auug.org.au>
Date:	Tue, 7 Apr 2015 14:05:06 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>,
	Eric Van Hensbergen <ericvh@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
Subject: linux-next: manual merge of the vfs tree with the v9fs tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
net/9p/protocol.c between commit 6250a8badb31 ("9p: use unsigned
integers for nwqid/count") from the v9fs tree and commit 3f39ef33084b
("net/9p: switch the guts of p9_client_{read,write}() to iov_iter")
from the vfs tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/9p/protocol.c
index 305e4789f2cc,e9d0f0c1a048..000000000000
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@@ -437,23 -439,13 +439,13 @@@ p9pdu_vwritef(struct p9_fcall *pdu, in
  						 stbuf->extension, stbuf->n_uid,
  						 stbuf->n_gid, stbuf->n_muid);
  			} break;
- 		case 'D':{
- 				uint32_t count = va_arg(ap, uint32_t);
- 				const void *data = va_arg(ap, const void *);
- 
- 				errcode = p9pdu_writef(pdu, proto_version, "d",
- 									count);
- 				if (!errcode && pdu_write(pdu, data, count))
- 					errcode = -EFAULT;
- 			}
- 			break;
- 		case 'U':{
+ 		case 'V':{
 -				int32_t count = va_arg(ap, int32_t);
 +				uint32_t count = va_arg(ap, uint32_t);
- 				const char __user *udata =
- 						va_arg(ap, const void __user *);
+ 				struct iov_iter *from =
+ 						va_arg(ap, struct iov_iter *);
  				errcode = p9pdu_writef(pdu, proto_version, "d",
  									count);
- 				if (!errcode && pdu_write_u(pdu, udata, count))
+ 				if (!errcode && pdu_write_u(pdu, from, count))
  					errcode = -EFAULT;
  			}
  			break;

Content of type "application/pgp-signature" skipped