Linux 2.6.17.10
Subsystems (5)
We (the -stable team) are announcing the release of the 2.6.17.10 kernel.
It contains three security fixes: one for SCTP, one for UDF filesystems, and one that only can be triggered by a local root user.
I'll also be replying to this message with a copy of the patch between 2.6.17.9 and 2.6.17.10, as it is small enough to do so.
The updated 2.6.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.17.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 - block/elevator.c | 3 +- fs/udf/super.c | 2 - fs/udf/truncate.c | 64 ++++++++++++++++++++++++++++------------------- include/net/sctp/sctp.h | 13 --------- include/net/sctp/sm.h | 3 -- net/sctp/sm_make_chunk.c | 30 ++++++---------------- net/sctp/sm_statefuns.c | 20 ++------------ net/sctp/socket.c | 10 ++++++- 9 files changed, 66 insertions(+), 81 deletions(-)
Summary of changes from v2.6.17.9 to v2.6.17.10
===============================================
Greg Kroah-Hartman:
Linux 2.6.17.10
Jan Kara:
Fix possible UDF deadlock and memory corruption (CVE-2006-4145)
Oleg Nesterov:
elv_unregister: fix possible crash on module unload
Sridhar Samudrala:
Fix sctp privilege elevation (CVE-2006-3745)
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 17 -EXTRAVERSION = .9 +EXTRAVERSION = .10 NAME=Crazed Snow-Weasel # *DOCUMENTATION*
block/elevator.c +2 -1
@@ -766,7 +766,8 @@ void elv_unregister(struct elevator_typeread_lock (&tasklist_lock); do_each_thread(g, p) {task_lock (p); - e->ops.trim (p->io_context); +if (p->io_context) + e->ops.trim (p->io_context);task_unlock (p); }while_each_thread (g, p);read_unlock (&tasklist_lock);
fs/udf/super.c +1 -1
@@ -1653,7 +1653,7 @@ #endifiput (inode); goto error_out; } - sb->s_maxbytes =MAX_LFS_FILESIZE ; + sb->s_maxbytes =1 <<30 ;return 0 ; error_out:
fs/udf/truncate.c +39 -25
76 lines not on this page · raw message
include/net/sctp/sctp.h +0 -13
@@ -405,19 +405,6 @@ static inline int sctp_list_single_entryreturn ((head->next != head) && (head->next == head->prev)); } -/* Calculate the size (in bytes) occupied by the data of an iovec. */ -static inline size_t get_user_iov_size (struct iovec *iov,int iovlen) -{ -size_t retval =0 ; - -for (; iovlen >0 ; --iovlen) { - retval += iov->iov_len; - iov++; - } - -return retval; -} -/* Generate a random jitter in the range of -50% ~ +50% of input RTO. */ static inline __s32 sctp_jitter (__u32 rto) {
include/net/sctp/sm.h +1 -2
@@ -221,8 +221,7 @@ struct sctp_chunk *sctp_make_abort_no_da const struct sctp_chunk *, __u32 tsn);struct sctp_chunk *sctp_make_abort_user (const struct sctp_association *, -const struct sctp_chunk *, -const struct msghdr *); +const struct msghdr *,size_t msg_len); struct sctp_chunk *sctp_make_abort_violation(const struct sctp_association *, const struct sctp_chunk *, const __u8 *,
net/sctp/sm_make_chunk.c +9 -21
@@ -806,38 +806,26 @@ no_mem:/* Helper to create ABORT with a SCTP_ERROR_USER_ABORT error. */ struct sctp_chunk *sctp_make_abort_user (const struct sctp_association *asoc, -const struct sctp_chunk *chunk, -const struct msghdr *msg) +const struct msghdr *msg, +size_t paylen) {struct sctp_chunk *retval; -void *payload =NULL , *payoff; -size_t paylen =0 ; -struct iovec *iov =NULL ; -int iovlen =0 ; - -if (msg) { - iov = msg->msg_iov; - iovlen = msg->msg_iovlen; - paylen =get_user_iov_size (iov, iovlen); - } +void *payload =NULL ; +int err; - retval =sctp_make_abort (asoc, chunk,sizeof (sctp_errhdr_t) + paylen); + retval =sctp_make_abort (asoc,NULL ,sizeof (sctp_errhdr_t) + paylen);if (!retval) goto err_chunk;if (paylen) {/* Put the msg_iov together into payload. */ - payload =kmalloc (paylen,GFP_ATOMIC ); + payload =kmalloc (paylen,GFP_KERNEL );if (!payload) goto err_payload; - payoff = payload; -for (; iovlen >0 ; --iovlen) { -if (copy_from_user (payoff, iov->iov_base,iov->iov_len)) - goto err_copy; - payoff += iov->iov_len; - iov++; - } + err =memcpy_fromiovec (payload, msg->msg_iov, paylen); +if (err <0 ) + goto err_copy; }sctp_init_cause (retval,SCTP_ERROR_USER_ABORT , payload, paylen);
net/sctp/sm_statefuns.c +4 -16
@@ -4026,18 +4026,12 @@ sctp_disposition_t sctp_sf_do_9_1_prm_ab* from its upper layer, but retransmits data to the far end * if necessary to fill gaps. */ -struct msghdr *msg = arg; -struct sctp_chunk *abort; +struct sctp_chunk *abort = arg;sctp_disposition_t retval; retval =SCTP_DISPOSITION_CONSUME ; -/* Generate ABORT chunk to send the peer. */ - abort =sctp_make_abort_user (asoc,NULL , msg); -if (!abort) - retval =SCTP_DISPOSITION_NOMEM ; -else -sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort)); +sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort));/* Even if we can't send the ABORT due to low memory delete the * TCB. This is a departure from our typical NOMEM handling.
@@ -4161,8 +4155,7 @@ sctp_disposition_t sctp_sf_cookie_wait_pvoid *arg, sctp_cmd_seq_t *commands) { - struct msghdr *msg = arg; -struct sctp_chunk *abort; + struct sctp_chunk *abort = arg;sctp_disposition_t retval;/* Stop T1-init timer */
@@ -4170,12 +4163,7 @@ sctp_disposition_t sctp_sf_cookie_wait_p SCTP_TO(SCTP_EVENT_TIMEOUT_T1_INIT)); retval =SCTP_DISPOSITION_CONSUME ; -/* Generate ABORT chunk to send the peer */ - abort =sctp_make_abort_user (asoc,NULL , msg); -if (!abort) - retval =SCTP_DISPOSITION_NOMEM ; -else -sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort)); +sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (abort));sctp_add_cmd_sf (commands,SCTP_CMD_NEW_STATE ,SCTP_STATE (SCTP_STATE_CLOSED ));
net/sctp/socket.c +9 -1
@@ -1477,8 +1477,16 @@ SCTP_STATIC int sctp_sendmsg(struct kioc goto out_unlock; }if (sinfo_flags &SCTP_ABORT ) { +struct sctp_chunk *chunk; + + chunk =sctp_make_abort_user (asoc, msg, msg_len); +if (!chunk) { + err = -ENOMEM ; + goto out_unlock; + } +SCTP_DEBUG_PRINTK ("Aborting association: %p\n" , asoc); -sctp_primitive_ABORT (asoc, msg); +sctp_primitive_ABORT (asoc, chunk); err =0 ; goto out_unlock; }
(Removing stable@ from Cc:)
Greg KH schrieb am 2006-08-22:
Quoted 2 lines
Sridhar Samudrala:
Fix sctp privilege elevation (CVE-2006-3745)
I've seen gazillions of CVE numbers for SCTP over the past months.
Should perhaps SCTP be dropped from the kernel until it has been audited for security by at least two independent parties?
Signature · 1 line
Matthias Andree
Quoted 11 lines · Matthias Andree
(Removing stable@ from Cc:)
Greg KH schrieb am 2006-08-22:
Quoted 2 lines
Sridhar Samudrala:
Fix sctp privilege elevation (CVE-2006-3745)I've seen gazillions of CVE numbers for SCTP over the past months.
Should perhaps SCTP be dropped from the kernel until it has been audited for security by at least two independent parties?
Are you willing to be one of those independent parties?
And if you haven't noticed, it seems that people are finally auditing the thing, luckily no one really uses it in the wild :)
thanks,
greg k-h
Quoted 9 lines
Quoted 7 lines
Quoted 2 lines
Sridhar Samudrala:
Fix sctp privilege elevation (CVE-2006-3745)I've seen gazillions of CVE numbers for SCTP over the past months.
Should perhaps SCTP be dropped from the kernel until it has been audited for security by at least two independent parties?
the thing, luckily no one really uses it in the wild :)
If other OS (such as mswin32) supported it, it would indeed get more testing.
Jan Engelhardt