• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: Commit

2.4.36-stable kernel tree


Commit MetaInfo

Revision9143f9a4c34cd8b918fef698960994a70dbebc9a (tree)
Zeit2005-06-20 12:23:14
AutorDavid S. Miller <davem@dave...>
CommiterDavid S. Miller

Log Message

[SPARC64]: Fix cmsg length checks in Solaris emulation layer.

Signed-off-by: David S. Miller <davem@davemloft.net>

Ändern Zusammenfassung

Diff

--- a/arch/sparc64/solaris/socket.c
+++ b/arch/sparc64/solaris/socket.c
@@ -410,8 +410,10 @@ asmlinkage int solaris_sendmsg(int fd, struct sol_nmsghdr *user_msg, unsigned us
410410 unsigned long *kcmsg;
411411 __kernel_size_t32 cmlen;
412412
413- if(kern_msg.msg_controllen > sizeof(ctl) &&
414- kern_msg.msg_controllen <= 256) {
413+ if (kern_msg.msg_controllen <= sizeof(__kernel_size_t32))
414+ return -EINVAL;
415+
416+ if(kern_msg.msg_controllen > sizeof(ctl)) {
415417 err = -ENOBUFS;
416418 ctl_buf = kmalloc(kern_msg.msg_controllen, GFP_KERNEL);
417419 if(!ctl_buf)
Show on old repository browser