ipc/sem: use flexible array in 'struct sem_undo'

[linux-2.6-block.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 00f88aa01ac5a051af7d94725ca8e0f785d0dd40..a39cdc7bf88fa25828b73429845de8258df58534 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -152,7 +152,7 @@ struct sem_undo {
        struct list_head        list_id;        /* per semaphore array list:
                                                 * all undos for one array */
        int                     semid;          /* semaphore set identifier */
-       short                   *semadj;        /* array of adjustments */
+       short                   semadj[];       /* array of adjustments */
                                                /* one per semaphore */
 };
 
@@ -1938,8 +1938,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
        rcu_read_unlock();
 
        /* step 2: allocate new undo structure */
-       new = kvzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems,
-                      GFP_KERNEL_ACCOUNT);
+       new = kvzalloc(struct_size(new, semadj, nsems), GFP_KERNEL_ACCOUNT);
        if (!new) {
                ipc_rcu_putref(&sma->sem_perm, sem_rcu_free);
                return ERR_PTR(-ENOMEM);
@@ -1967,7 +1966,6 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
                goto success;
        }
        /* step 5: initialize & link new undo structure */
-       new->semadj = (short *) &new[1];
        new->ulp = ulp;
        new->semid = semid;
        assert_spin_locked(&ulp->lock);