From baf17df6dfc45476dea4ebd8cf7dad5708b79ec8 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 15 Mar 2010 18:03:05 +0100 Subject: [PATCH] --- yaml --- r: 194903 b: refs/heads/master c: 1da05f50f6a766c7611102382f85183b4db96c2d h: refs/heads/master i: 194901: 522b54df57860531fe89010ed498643647912df6 194899: b9bb26cd5f3acb4bf337a8fcd558b2b20bb0ca72 194895: 1debdf338e9f6efc7e2554f81a4069896e58d26d v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipvs/ip_vs_ftp.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2da5dd00e8b9..dcedd1abd00e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b4df05537f4e6c0c3524055ece7f99b5c98cc87 +refs/heads/master: 1da05f50f6a766c7611102382f85183b4db96c2d diff --git a/trunk/net/netfilter/ipvs/ip_vs_ftp.c b/trunk/net/netfilter/ipvs/ip_vs_ftp.c index 73f38ea98f25..9f6328303844 100644 --- a/trunk/net/netfilter/ipvs/ip_vs_ftp.c +++ b/trunk/net/netfilter/ipvs/ip_vs_ftp.c @@ -208,8 +208,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, */ from.ip = n_cp->vaddr.ip; port = n_cp->vport; - sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip), - (ntohs(port)>>8)&255, ntohs(port)&255); + snprintf(buf, sizeof(buf), "%u,%u,%u,%u,%u,%u", + ((unsigned char *)&from.ip)[0], + ((unsigned char *)&from.ip)[1], + ((unsigned char *)&from.ip)[2], + ((unsigned char *)&from.ip)[3], + ntohs(port) >> 8, + ntohs(port) & 0xFF); + buf_len = strlen(buf); /*