[ARM] 4750/1: [AT91] STN LCD displays on SAM9261

[linux-2.6-omap-h63xx.git] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index d74d82155d78e20cd008a289751bcaca70b27f7a..377e560ab5c98bb99cc5d83340082c926b2c39de 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -254,6 +254,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
        if (copy_to_user(CMSG_COMPAT_DATA(cm), data, cmlen - sizeof(struct compat_cmsghdr)))
                return -EFAULT;
        cmlen = CMSG_COMPAT_SPACE(len);
+       if (kmsg->msg_controllen < cmlen)
+               cmlen = kmsg->msg_controllen;
        kmsg->msg_control += cmlen;
        kmsg->msg_controllen -= cmlen;
        return 0;