diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2022-07-22 11:16:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-25 11:49:25 +0100 |
| commit | f46040eeaf2e523a4096199fd93a11e794818009 (patch) | |
| tree | 1eaea45d134da6e97904997ca1a9f786f716cbb9 /drivers | |
| parent | 1aaa62c4838a140d0592935c51985158963d5971 (diff) | |
| download | linux-stable-f46040eeaf2e523a4096199fd93a11e794818009.tar.gz linux-stable-f46040eeaf2e523a4096199fd93a11e794818009.tar.bz2 linux-stable-f46040eeaf2e523a4096199fd93a11e794818009.zip | |
macsec: fix NULL deref in macsec_add_rxsa
Commit 48ef50fa866a added a test on tb_sa[MACSEC_SA_ATTR_PN], but
nothing guarantees that it's not NULL at this point. The same code was
added to macsec_add_txsa, but there it's not a problem because
validate_add_txsa checks that the MACSEC_SA_ATTR_PN attribute is
present.
Note: it's not possible to reproduce with iproute, because iproute
doesn't allow creating an SA without specifying the PN.
Fixes: 48ef50fa866a ("macsec: Netlink support of XPN cipher suites (IEEE 802.1AEbw)")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=208315
Reported-by: Frantisek Sumsal <fsumsal@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/macsec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 817577e713d7..769a1eca6bd8 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1753,7 +1753,8 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info) } pn_len = secy->xpn ? MACSEC_XPN_PN_LEN : MACSEC_DEFAULT_PN_LEN; - if (nla_len(tb_sa[MACSEC_SA_ATTR_PN]) != pn_len) { + if (tb_sa[MACSEC_SA_ATTR_PN] && + nla_len(tb_sa[MACSEC_SA_ATTR_PN]) != pn_len) { pr_notice("macsec: nl: add_rxsa: bad pn length: %d != %d\n", nla_len(tb_sa[MACSEC_SA_ATTR_PN]), pn_len); rtnl_unlock(); |