1 files changed, 5 insertions, 1 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 8247c49ec073..34af1fe34701 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -491,10 +491,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
 
         sprintf (name, "SYSV%08x", key);
         if (shmflg & SHM_HUGETLB) {
+                struct hstate *hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT)
+                                                & SHM_HUGE_MASK);
+                size_t hugesize = ALIGN(size, huge_page_size(hs));
+
                 /* hugetlb_file_setup applies strict accounting */
                 if (shmflg & SHM_NORESERVE)
                         acctflag = VM_NORESERVE;
-                file = hugetlb_file_setup(name, 0, size, acctflag,
+                file = hugetlb_file_setup(name, hugesize, acctflag,
                                   &shp->mlock_user, HUGETLB_SHMFS_INODE,
                                 (shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK);
         } else {