| Message ID | 20211111205916.37899-1-tadeusz.struk@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tipc: check for null after calling kmemdup | expand |
On 11/11/21 15:59, Tadeusz Struk wrote: > kmemdup can return a null pointer so need to check for it, otherwise > the null key will be dereferenced later in tipc_crypto_key_xmit as > can be seen in the trace [1]. > > Cc: Jon Maloy <jmaloy@redhat.com> > Cc: Ying Xue <ying.xue@windriver.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: netdev@vger.kernel.org > Cc: tipc-discussion@lists.sourceforge.net > Cc: linux-kernel@vger.kernel.org > Cc: stable@vger.kernel.org # 5.15, 5.14, 5.10 > > [1] https://syzkaller.appspot.com/bug?id=bca180abb29567b189efdbdb34cbf7ba851c2a58 > > Reported-by: Dmitry Vyukov <dvyukov@google.com> > Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> > --- > net/tipc/crypto.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c > index dc60c32bb70d..988a343f9fd5 100644 > --- a/net/tipc/crypto.c > +++ b/net/tipc/crypto.c > @@ -597,6 +597,11 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey, > tmp->cloned = NULL; > tmp->authsize = TIPC_AES_GCM_TAG_SIZE; > tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL); > + if (!tmp->key) { > + free_percpu(tmp->tfm_entry); > + kfree_sensitive(tmp); > + return -ENOMEM; > + } > memcpy(&tmp->salt, ukey->key + keylen, TIPC_AES_GCM_SALT_SIZE); > atomic_set(&tmp->users, 0); > atomic64_set(&tmp->seqno, 0); Acked-by: Jon Maloy <jmaloy@redhat.com>
On Thu, 11 Nov 2021 12:59:15 -0800 Tadeusz Struk wrote: > kmemdup can return a null pointer so need to check for it, otherwise > the null key will be dereferenced later in tipc_crypto_key_xmit as > can be seen in the trace [1]. > Reported-by: Dmitry Vyukov <dvyukov@google.com> > Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> Fixes: 1ef6f7c9390f ("tipc: add automatic session key exchange")
On Thu, 11 Nov 2021 19:06:18 -0500 Jon Maloy wrote: > On 11/11/21 15:59, Tadeusz Struk wrote: > > kmemdup can return a null pointer so need to check for it, otherwise > > the null key will be dereferenced later in tipc_crypto_key_xmit as > > can be seen in the trace [1]. > > [1] https://syzkaller.appspot.com/bug?id=bca180abb29567b189efdbdb34cbf7ba851c2a58 > > > > Reported-by: Dmitry Vyukov <dvyukov@google.com> > > Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> > > --- > > net/tipc/crypto.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c > > index dc60c32bb70d..988a343f9fd5 100644 > > --- a/net/tipc/crypto.c > > +++ b/net/tipc/crypto.c > > @@ -597,6 +597,11 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey, > > tmp->cloned = NULL; > > tmp->authsize = TIPC_AES_GCM_TAG_SIZE; > > tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL); > > + if (!tmp->key) { > > + free_percpu(tmp->tfm_entry); > > + kfree_sensitive(tmp); > > + return -ENOMEM; > > + } > Acked-by: Jon Maloy <jmaloy@redhat.com> Hm, shouldn't we free all the tfm entries here?
On 11/12/21 20:13, Jakub Kicinski wrote: >>> @@ -597,6 +597,11 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey, >>> tmp->cloned = NULL; >>> tmp->authsize = TIPC_AES_GCM_TAG_SIZE; >>> tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL); >>> + if (!tmp->key) { >>> + free_percpu(tmp->tfm_entry); >>> + kfree_sensitive(tmp); >>> + return -ENOMEM; >>> + } >> Acked-by: Jon Maloy<jmaloy@redhat.com> > Hm, shouldn't we free all the tfm entries here? Right, I think we just need to call tipc_aead_free(&tmp->rcu); here and return an error.
On Fri, 12 Nov 2021 21:42:11 -0800 Tadeusz Struk wrote: > On 11/12/21 20:13, Jakub Kicinski wrote: > [...] > >> Acked-by: Jon Maloy<jmaloy@redhat.com> > > Hm, shouldn't we free all the tfm entries here? > > Right, I think we just need to call tipc_aead_free(&tmp->rcu); > here and return an error. Would be good to get an ack From Jon or Ying on that one.
On Tue, 16 Nov 2021 11:32:32 -0800 Jakub Kicinski wrote: > On Fri, 12 Nov 2021 21:42:11 -0800 Tadeusz Struk wrote: > > On 11/12/21 20:13, Jakub Kicinski wrote: > > [...] > [...] > > > Hm, shouldn't we free all the tfm entries here? > > > > Right, I think we just need to call tipc_aead_free(&tmp->rcu); > > here and return an error. > > Would be good to get an ack From Jon or Ying on that one. Ah, I hit reply on the wrong sub-thread, this was meant for the "any feedback question".
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c index dc60c32bb70d..988a343f9fd5 100644 --- a/net/tipc/crypto.c +++ b/net/tipc/crypto.c @@ -597,6 +597,11 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey, tmp->cloned = NULL; tmp->authsize = TIPC_AES_GCM_TAG_SIZE; tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL); + if (!tmp->key) { + free_percpu(tmp->tfm_entry); + kfree_sensitive(tmp); + return -ENOMEM; + } memcpy(&tmp->salt, ukey->key + keylen, TIPC_AES_GCM_SALT_SIZE); atomic_set(&tmp->users, 0); atomic64_set(&tmp->seqno, 0);
kmemdup can return a null pointer so need to check for it, otherwise the null key will be dereferenced later in tipc_crypto_key_xmit as can be seen in the trace [1]. Cc: Jon Maloy <jmaloy@redhat.com> Cc: Ying Xue <ying.xue@windriver.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: netdev@vger.kernel.org Cc: tipc-discussion@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # 5.15, 5.14, 5.10 [1] https://syzkaller.appspot.com/bug?id=bca180abb29567b189efdbdb34cbf7ba851c2a58 Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> --- net/tipc/crypto.c | 5 +++++ 1 file changed, 5 insertions(+)