OSDN Git Service

netlabel: cope with NULL catmap
authorPaolo Abeni <pabeni@redhat.com>
Tue, 12 May 2020 12:43:14 +0000 (14:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2020 01:12:40 +0000 (18:12 -0700)
commiteead1c2ea2509fd754c6da893a94f0e69e83ebe4
tree74a6833236e82b1de6ec523ef9ae7e3bde1250fa
parent24adbc1676af4e134e709ddc7f34cf2adc2131e4
netlabel: cope with NULL catmap

The cipso and calipso code can set the MLS_CAT attribute on
successful parsing, even if the corresponding catmap has
not been allocated, as per current configuration and external
input.

Later, selinux code tries to access the catmap if the MLS_CAT flag
is present via netlbl_catmap_getlong(). That may cause null ptr
dereference while processing incoming network traffic.

Address the issue setting the MLS_CAT flag only if the catmap is
really allocated. Additionally let netlbl_catmap_getlong() cope
with NULL catmap.

Reported-by: Matthew Sheets <matthew.sheets@gd-ms.com>
Fixes: 4b8feff251da ("netlabel: fix the horribly broken catmap functions")
Fixes: ceba1832b1b2 ("calipso: Set the calipso socket label to match the secattr.")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/cipso_ipv4.c
net/ipv6/calipso.c
net/netlabel/netlabel_kapi.c