On Mon, 12 Aug 2019 17:57:31 +0100
Jeremy Sowden <jeremy@xxxxxxxxxx> wrote:
> On 2019-08-12, at 23:17:52 +0800, Jan Engelhardt wrote:
> > On Monday 2019-08-12 19:57, Jeremy Sowden wrote:
> > >shash_desc::flags was removed from the kernel in 5.1.
> > >
> > >Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
> > >---
> > > extensions/pknock/xt_pknock.c | 1 -
> > > extensions/xt_SYSRQ.c | 1 -
> > > 2 files changed, 2 deletions(-)
> > >
> > >diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
> > >index c76901ac4c1a..8021ea07e1b9 100644
> > >--- a/extensions/pknock/xt_pknock.c
> > >+++ b/extensions/pknock/xt_pknock.c
> > >@@ -1125,7 +1125,6 @@ static int __init xt_pknock_mt_init(void)
> > >
> > > crypto.size = crypto_shash_digestsize(crypto.tfm);
> > > crypto.desc.tfm = crypto.tfm;
> > >- crypto.desc.flags = 0;
> >
> > But this will still be needed for 5.0 I guess, so it cannot just be
> > unconditionally removed.
>
> That assignment was actually superfluous anyway, because crypto.desc is
> zero-initialized when crypto is initialized (xt_pknock.c, ll. 110ff.):
>
> static struct {
> const char *algo;
> struct crypto_shash *tfm;
> unsigned int size;
> struct shash_desc desc;
> } crypto = {
> .algo = "hmac(sha256)",
> .tfm = NULL,
> .size = 0
> };
>
> In fact the explicit zero-initialization of .tfm and .size is also
> superfluous and can be removed:
>
> static struct {
> const char *algo;
> struct crypto_shash *tfm;
> unsigned int size;
> struct shash_desc desc;
> } crypto = {
> .algo = "hmac(sha256)",
> };
>
> Adding an initializer to the variable declaration in xt_SYSRQ.c will do
> the same thing. Patch attached.
>
> J.
Hi Jeremy, thanks for Your patches!
Please, they are only here in mail list, or also in any repo?
Or will be some new package release and I should wait?
My xtables-addons v3.3 package list SourceForge as project home site,
but I can't find there nothing newer than stuff from March 2019:
https://sourceforge.net/p/xtables-addons/xtables-addons/ci/master/tree/
Or am I wrong?
--
Thanks, Franta Hanzlik
