scm: lower SCM_MAX_FD

[net-next-2.6.git] / net / core / scm.c

diff --git a/net/core/scm.c b/net/core/scm.c
index 413cab89017d0818c997b8d6a807997fa47c92d0..bbe4544508016925726522f275e95aefadeb1664 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -79,10 +79,11 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)
                        return -ENOMEM;
                *fplp = fpl;
                fpl->count = 0;
+               fpl->max = SCM_MAX_FD;
        }
        fpp = &fpl->fp[fpl->count];
 
-       if (fpl->count + num > SCM_MAX_FD)
+       if (fpl->count + num > fpl->max)
                return -EINVAL;
 
        /*
@@ -331,11 +332,12 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)
        if (!fpl)
                return NULL;
 
-       new_fpl = kmalloc(sizeof(*fpl), GFP_KERNEL);
+       new_fpl = kmemdup(fpl, offsetof(struct scm_fp_list, fp[fpl->count]),
+                         GFP_KERNEL);
        if (new_fpl) {
-               for (i=fpl->count-1; i>=0; i--)
+               for (i = 0; i < fpl->count; i++)
                        get_file(fpl->fp[i]);
-               memcpy(new_fpl, fpl, sizeof(*fpl));
+               new_fpl->max = new_fpl->count;
        }
        return new_fpl;
 }