diff for duplicates of <1289524026.5167.68.camel@dan> diff --git a/a/1.txt b/N1/1.txt index 6d250f1..3404ba4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,7 +85,7 @@ index 7e41e2c..53dbdd0 100644 - dest->s6_addr32[2], dest->s6_addr32[3], destp, - sp->sk_state, - tp->write_seq-tp->snd_una, -- (sp->sk_state = TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), +- (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), - timer_active, - jiffies_to_clock_t(timer_expires - jiffies), - icsk->icsk_retransmits, @@ -111,7 +111,7 @@ index 7e41e2c..53dbdd0 100644 + dest->s6_addr32[2], dest->s6_addr32[3], destp, + sp->sk_state, + tp->write_seq-tp->snd_una, -+ (sp->sk_state = TCP_LISTEN) ? ++ (sp->sk_state == TCP_LISTEN) ? + sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), + timer_active, + jiffies_to_clock_t(timer_expires - jiffies), @@ -136,7 +136,7 @@ index 7e41e2c..53dbdd0 100644 + dest->s6_addr32[2], dest->s6_addr32[3], destp, + sp->sk_state, + tp->write_seq-tp->snd_una, -+ (sp->sk_state = TCP_LISTEN) ? ++ (sp->sk_state == TCP_LISTEN) ? + sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq), + timer_active, + jiffies_to_clock_t(timer_expires - jiffies), diff --git a/a/content_digest b/N1/content_digest index d9a03b2..5412eff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "From\0Dan Rosenberg <drosenberg@vsecurity.com>\0" "Subject\0[PATCH 4/10] Fix leaking of kernel heap addresses in net/\0" - "Date\0Fri, 12 Nov 2010 01:07:06 +0000\0" + "Date\0Thu, 11 Nov 2010 20:07:06 -0500\0" "To\0David S. Miller <davem@davemloft.net>" Oliver Hartkopp <socketcan@hartkopp.net> Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Urs Thuermann <urs.thuermann@volkswagen.de> - " Hideaki\0" + " Hideaki YOSHI\0" "\00:1\0" "b\0" "diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c\n" @@ -95,7 +95,7 @@ "-\t\t dest->s6_addr32[2], dest->s6_addr32[3], destp,\n" "-\t\t sp->sk_state,\n" "-\t\t tp->write_seq-tp->snd_una,\n" - "-\t\t (sp->sk_state = TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),\n" + "-\t\t (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),\n" "-\t\t timer_active,\n" "-\t\t jiffies_to_clock_t(timer_expires - jiffies),\n" "-\t\t icsk->icsk_retransmits,\n" @@ -121,7 +121,7 @@ "+\t\t\tdest->s6_addr32[2], dest->s6_addr32[3], destp,\n" "+\t\t\tsp->sk_state,\n" "+\t\t\ttp->write_seq-tp->snd_una,\n" - "+\t\t\t(sp->sk_state = TCP_LISTEN) ?\n" + "+\t\t\t(sp->sk_state == TCP_LISTEN) ?\n" "+\t\t\tsp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),\n" "+\t\t\ttimer_active,\n" "+\t\t\tjiffies_to_clock_t(timer_expires - jiffies),\n" @@ -146,7 +146,7 @@ "+\t\t\tdest->s6_addr32[2], dest->s6_addr32[3], destp,\n" "+\t\t\tsp->sk_state,\n" "+\t\t\ttp->write_seq-tp->snd_una,\n" - "+\t\t\t(sp->sk_state = TCP_LISTEN) ?\n" + "+\t\t\t(sp->sk_state == TCP_LISTEN) ?\n" "+\t\t\tsp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),\n" "+\t\t\ttimer_active,\n" "+\t\t\tjiffies_to_clock_t(timer_expires - jiffies),\n" @@ -207,4 +207,4 @@ " \n" static int tcp6_seq_show(struct seq_file *seq, void *v) -c87d5f5c93ccae970855c2cd60b71a6e677887adbde9a4448a8e9e5f20db8edf +060b049736cf81af9197201473c4198fd67c5689ba8a3575ceaf8ea461066fb3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.