Commit b005ab4e authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

inet_diag: Export inet diag cookie checking routine 



The netlink diag susbsys stores sk address bits in the nl message
as a "cookie" and uses one when dumps details about particular
socket.

The same will be required for udp diag module, so introduce a heler
in inet_diag module

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87c22ea5

include/linux/inet_diag.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ struct inet_diag_handler { 
	__u16                   idiag_type;

};



int inet_diag_check_cookie(struct sock *sk, struct inet_diag_req *req);



extern int  inet_diag_register(const struct inet_diag_handler *handler);

extern void inet_diag_unregister(const struct inet_diag_handler *handler);

#endif /* __KERNEL__ */

net/ipv4/inet_diag.c

+14 −5
Original line number Diff line number Diff line
@@ -246,6 +246,18 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, 
	return inet_csk_diag_fill(sk, skb, r, pid, seq, nlmsg_flags, unlh);

}



int inet_diag_check_cookie(struct sock *sk, struct inet_diag_req *req)

{

	if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||

	     req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&

	    ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||

	     (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))

		return -ESTALE;

	else

		return 0;

}

EXPORT_SYMBOL_GPL(inet_diag_check_cookie);



static int inet_diag_get_exact(struct sk_buff *in_skb,

			       const struct nlmsghdr *nlh,

			       struct inet_diag_req *req)
@@ -288,11 +300,8 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, 
	if (sk == NULL)

		goto unlock;



	err = -ESTALE;

	if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||

	     req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&

	    ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||

	     (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))

	err = inet_diag_check_cookie(sk, req);

	if (err)

		goto out;



	err = -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE