Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1604107
| Path | csiph.com!news.freedyn.net!open-news-network.org!newsfeed.datemas.de!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the fscrypt tree with Linus' tree |
| Date | Mon, 20 Mar 2017 00:40:02 +0100 |
| Message-ID | <tmSAy-4wi-5@gated-at.bofh.it> (permalink) |
| X-Original-To | Theodore Ts'o <tytso@mit.edu> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1489965470; bh=DDaXHy2q7p3m4g785dPeLbLys2qftKsoD/XNxV9Q3ug=; h=Date:From:To:Cc:Subject:From; b=r99ldarsHvsukmTokutWdRtqtmCCJAVzhYRb79KpAfWrJBCRPsBmm1c4QT6kf3azJ 3yzkLiaiJ/HXHfrnKQUo6p5dtN9ia46WCJZc9MuvYAL7aqfrUzo54oVRaAXFhR7P5c VucSj0f+Yj1FFKYIB0ZNzcOS+SdrUqr/c1rBSFtkCko+suaqR+YgRGzPG4Zu7G2WTf /uvJj5MX0DK/nO2LkRxS4TaNLZvghVHFNJzQYkP7cQsISKRVk4p6UFlv09+bmjcgGU KUYHTlTjKM+tN85hUefWkGldEDOjWSD5kHuvYg8E3BfcJ54+rMvgRHcVTxa+IuE+zD l2J5SXO340d8w== |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 44 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>, James Morris <james.l.morris@oracle.com>, Eric Biggers <ebiggers@google.com> |
| X-Original-Date | Mon, 20 Mar 2017 10:17:49 +1100 |
| X-Original-Message-ID | <20170320101749.721456cf@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1604107 |
Show key headers only | View raw
Hi Ted,
Today's linux-next merge of the fscrypt tree got a conflict in:
fs/crypto/keyinfo.c
between commit:
0837e49ab3fa ("KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()")
from Linus' tree and commit:
1b53cf9815bb ("fscrypt: remove broken support for detecting keyring key revocation")
from the fscrypt 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/crypto/keyinfo.c
index d5d896fa5a71,cb3e82abf034..000000000000
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@@ -102,11 -103,9 +103,9 @@@ static int validate_user_key(struct fsc
res = -ENOKEY;
goto out;
}
- down_read(&keyring_key->sem);
- ukp = user_key_payload(keyring_key);
+ ukp = user_key_payload_locked(keyring_key);
if (ukp->datalen != sizeof(struct fscrypt_key)) {
res = -EINVAL;
- up_read(&keyring_key->sem);
goto out;
}
master_key = (struct fscrypt_key *)ukp->data;
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the fscrypt tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-20 00:40 +0100
csiph-web