• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: コミット

2.4.36-stable kernel tree


コミットメタ情報

リビジョン863c2673cea6702422e722aa754fe3845413e20c (tree)
日時2006-08-31 05:45:34
作者dann frazier <dannf@dann...>
コミッターWilly Tarreau

ログメッセージ

[PATCH] [SCTP] Fix sctp_primitive_ABORT() call in sctp_close()

Here is a 2.4 backport of David's fix for a problem with the recent
embargoed patch for CVE-2006-3745. Compile-tested, original
description follows:

[SCTP]: Fix sctp_primitive_ABORT() call in sctp_close().

With the recent fix, the callers of sctp_primitive_ABORT()
need to create an ABORT chunk and pass it as an argument rather
than msghdr that was passed earlier.

Signed-off-by: dann frazier <dannf@debian.org>

変更サマリ

差分

--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -967,9 +967,13 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout)
967967 sctp_unhash_established(asoc);
968968 sctp_association_free(asoc);
969969
970- } else if (sk->linger && !sk->lingertime)
971- sctp_primitive_ABORT(asoc, NULL);
972- else
970+ } else if (sk->linger && !sk->lingertime) {
971+ struct sctp_chunk *chunk;
972+
973+ chunk = sctp_make_abort_user(asoc, NULL, 0);
974+ if (chunk)
975+ sctp_primitive_ABORT(asoc, NULL);
976+ } else
973977 sctp_primitive_SHUTDOWN(asoc, NULL);
974978 } else
975979 sctp_primitive_SHUTDOWN(asoc, NULL);
旧リポジトリブラウザで表示