From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Theodore Ts'o <tytso@mit•edu>, Eric Biggers <ebiggers@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Satya Tangirala <satyat@google•com>,
Waiman Long <longman@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the fscrypt tree
Date: Wed, 8 Jul 2020 20:46:54 +1000 [thread overview]
Message-ID: <20200708204654.41f1a274@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/crypto/keysetup_v1.c
between commit:
73f43e98d01e ("fscrypt: add inline encryption support")
from the fscrypt tree and commit:
f15de703d326 ("mm, treewide: rename kzfree() to kfree_sensitive()")
from the akpm-current 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/keysetup_v1.c
index a52686729a67,c8a930f8faf2..000000000000
--- a/fs/crypto/keysetup_v1.c
+++ b/fs/crypto/keysetup_v1.c
@@@ -154,8 -154,8 +154,8 @@@ struct fscrypt_direct_key
static void free_direct_key(struct fscrypt_direct_key *dk)
{
if (dk) {
- crypto_free_skcipher(dk->dk_ctfm);
+ fscrypt_destroy_prepared_key(&dk->dk_key);
- kzfree(dk);
+ kfree_sensitive(dk);
}
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-07-08 10:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708204654.41f1a274@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ebiggers@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=longman@redhat$(echo .)com \
--cc=satyat@google$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox