Commit 2200313a authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Uninitialized when used in __nf_conntrack_update(), from
   Nathan Chancellor.

2) Comparison of unsigned expression in nf_confirm_cthelper().

3) Remove 'const' type qualifier with no effect.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b86cb82 4946ea5c

include/linux/netfilter/nf_conntrack_pptp.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <net/netfilter/nf_conntrack_expect.h>

#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h>



extern const char *const pptp_msg_name(u_int16_t msg);

const char *pptp_msg_name(u_int16_t msg);



/* state of the control session */

enum pptp_ctrlsess_state {

net/netfilter/nf_conntrack_core.c

+4 −4
Original line number Diff line number Diff line
@@ -2017,11 +2017,11 @@ static void nf_conntrack_attach(struct sk_buff *nskb, const struct sk_buff *skb) 
}



static int __nf_conntrack_update(struct net *net, struct sk_buff *skb,

				 struct nf_conn *ct)

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo)

{

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;

	enum ip_conntrack_info ctinfo;

	struct nf_nat_hook *nat_hook;

	unsigned int status;

	int dataoff;
@@ -2092,7 +2092,7 @@ static int nf_confirm_cthelper(struct sk_buff *skb, struct nf_conn *ct, 
{

	const struct nf_conntrack_helper *helper;

	const struct nf_conn_help *help;

	unsigned int protoff;

	int protoff;



	help = nfct_help(ct);

	if (!help)
@@ -2146,7 +2146,7 @@ static int nf_conntrack_update(struct net *net, struct sk_buff *skb) 
		return 0;



	if (!nf_ct_is_confirmed(ct)) {

		err = __nf_conntrack_update(net, skb, ct);

		err = __nf_conntrack_update(net, skb, ct, ctinfo);

		if (err < 0)

			return err;

	}

net/netfilter/nf_conntrack_pptp.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static const char *const pptp_msg_name_array[PPTP_MSG_MAX + 1] = { 
	[PPTP_SET_LINK_INFO]		= "SET_LINK_INFO"

};



const char *const pptp_msg_name(u_int16_t msg)

const char *pptp_msg_name(u_int16_t msg)

{

	if (msg > PPTP_MSG_MAX)

		return pptp_msg_name_array[0];

CRA Git | Maintained and supported by SUSTech CRA and CCSE