Hello,
On Sun, 3 Oct 2010, Simon Horman wrote:
REVISIONS
This is v3 of the patch series with addresses serveral problems
raised by Julian Anastasov on the lvs-devel mailing list.
No other obvious problems in v3 1-12. So,
Acked-by: Julian Anastasov <ja@xxxxxx>
Thanks.
May be next days I'll test my changes on top of PE v3
I think that could save a bit of porting work later
and perhaps you might notice some more bugs too :-)
Appending fixes from my tests:
- initialize compat structures to avoid crash in
ip_vs_add_service for pe_name
- fix ip_vs_conn_out_get_proto to properly check the
ip_vs_conn_fill_param_proto result
Signed-off-by: Julian Anastasov <ja@xxxxxx>
---
diff -urp net-next-2.6-e548833-test_pe3/linux/net/netfilter/ipvs/ip_vs_conn.c linux/net/netfilter/ipvs/ip_vs_conn.c
--- net-next-2.6-e548833-test_pe3/linux/net/netfilter/ipvs/ip_vs_conn.c 2010-10-03 23:08:47.928356111 +0300
+++ linux/net/netfilter/ipvs/ip_vs_conn.c 2010-10-03 23:32:47.309353117 +0300
@@ -439,7 +439,7 @@ ip_vs_conn_out_get_proto(int af, const s
{
struct ip_vs_conn_param p;
- if (!ip_vs_conn_fill_param_proto(af, skb, iph, proto_off, inverse, &p))
+ if (ip_vs_conn_fill_param_proto(af, skb, iph, proto_off, inverse, &p))
return NULL;
return ip_vs_conn_out_get(&p);
diff -urp net-next-2.6-e548833-test_pe3/linux/net/netfilter/ipvs/ip_vs_ctl.c linux/net/netfilter/ipvs/ip_vs_ctl.c
--- net-next-2.6-e548833-test_pe3/linux/net/netfilter/ipvs/ip_vs_ctl.c 2010-10-03 22:33:53.881353731 +0300
+++ linux/net/netfilter/ipvs/ip_vs_ctl.c 2010-10-03 22:49:48.279355927 +0300
@@ -2057,6 +2057,7 @@ static const unsigned char set_arglen[SE
static void ip_vs_copy_usvc_compat(struct ip_vs_service_user_kern *usvc,
struct ip_vs_service_user *usvc_compat)
{
+ memset(usvc, 0, sizeof(*usvc));
usvc->af = AF_INET;
usvc->protocol = usvc_compat->protocol;
usvc->addr.ip = usvc_compat->addr;
@@ -2074,6 +2075,7 @@ static void ip_vs_copy_usvc_compat(struc
static void ip_vs_copy_udest_compat(struct ip_vs_dest_user_kern *udest,
struct ip_vs_dest_user *udest_compat)
{
+ memset(udest, 0, sizeof(*udest));
udest->addr.ip = udest_compat->addr;
udest->port = udest_compat->port;
udest->conn_flags = udest_compat->conn_flags;
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
