Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 777b25a2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[CCID]: Check if ccid is NULL in the hc_[tr]x_exit functions 



For consistency with ccid_exit and to fix a bug when
IP_DCCP_UNLOAD_HACK is enabled as the control sock is not associated
to any CCID.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 061cb4a0

net/dccp/ccid.h

+2 −2
Original line number Diff line number Diff line
@@ -110,14 +110,14 @@ static inline int ccid_hc_tx_init(struct ccid *ccid, struct sock *sk) 


static inline void ccid_hc_rx_exit(struct ccid *ccid, struct sock *sk)

{

	if (ccid->ccid_hc_rx_exit != NULL &&

	if (ccid != NULL && ccid->ccid_hc_rx_exit != NULL &&

	    dccp_sk(sk)->dccps_hc_rx_ccid_private != NULL)

		ccid->ccid_hc_rx_exit(sk);

}



static inline void ccid_hc_tx_exit(struct ccid *ccid, struct sock *sk)

{

	if (ccid->ccid_hc_tx_exit != NULL &&

	if (ccid != NULL && ccid->ccid_hc_tx_exit != NULL &&

	    dccp_sk(sk)->dccps_hc_tx_ccid_private != NULL)

		ccid->ccid_hc_tx_exit(sk);

}