From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 14DD93945050 for ; Tue, 10 Mar 2020 13:35:01 +0000 (GMT) Received: by mail-qk1-x741.google.com with SMTP id u25so12692941qkk.3 for ; Tue, 10 Mar 2020 06:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=8nwLF4efziNK2pvjUYEVGj5gk4UiqNk5z0KG8TrU810=; b=wQb4T/4ocN/x4tVyP0hPfrYOPEdZ9EL7tJzdDZsqY5ghhqvvNThN+RHdKysp3nWAsD nT6acQv9GDocDqF5lpILjTI8NfpbO76mTD6F4bsuL2uTvGho5FcVYNgDQc/OKvUn6V4e mVQypnuvkBkrz2z9F2bEZYB3RRE9rmwZXaxjl6WPuUlJzskXI4D6lHvd31MZ4eG4xzYd ZeaO//ihf+xjza+l8muAj0cJcRVEJ4zndal0DmbZFi9feZ8rrt9o9wg1kOaxkV/jNgZ3 FdPdmutHc4X8ZiNKxglnq90dC2atQ3PjD4IK+leM7E9ZH+oknSRoSI4OyUlHf/ukX72R P6uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8nwLF4efziNK2pvjUYEVGj5gk4UiqNk5z0KG8TrU810=; b=FGvZ6/yO1IeGFrRVtAo/kmeEYW/XQ6gk27Qs7bjh1AzQqVGfErboHAKXAU+qaO+tG/ qBeIuWCeKaDS8FLQRw/bVbNRsSBE/YAGNEebtB1PwU3K3t7B/sSSMBtDw6w9+jYmtTuV Ltvj6EYcLaHjTItYFukvcQHys6R4m1jRHTjglrHHppRwyKIxf9VB5wIuEOE1xP01Ge9u kDyOJM+lv8fsc2IiT8LGYpZ/3odeywO7qqkV+KJi/xr+YisKK2uerH/mspAe7yS7JD5R tERgLWHjh/ZZONbZiwK9YFOU1/DCmt9uDdCwNugXINxubBawEzcwYnxVrFO9JxyXVEm9 7Ttg== X-Gm-Message-State: ANhLgQ0SuUMPY86zWw1PAgBziKM/H4HONToFrz8wkMF0MkB2ofq408Jl 861XxEH0ZYCbgsMYeJtuZ4W2aAFIDFw= X-Google-Smtp-Source: ADFU+vsX0X4uasj9LRXmkkVNGuWSZge9lMq0BFOyS9usPyX+fKA83jIApN14y9TiS4cNQHzKCig1ng== X-Received: by 2002:a37:6215:: with SMTP id w21mr19915473qkb.149.1583847300340; Tue, 10 Mar 2020 06:35:00 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id g2sm23674070qkb.27.2020.03.10.06.34.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 06:34:59 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [2.31 COMMITTED] linux: Clear mode_t padding bits (BZ#25623) Date: Tue, 10 Mar 2020 10:34:51 -0300 Message-Id: <20200310133454.20821-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200310133454.20821-1-adhemerval.zanella@linaro.org> References: <20200310133454.20821-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-27.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2020 13:35:01 -0000 The kernel might not clear the padding value for the ipc_perm mode fields in compat mode (32 bit running on a 64 bit kernel). It was fixed on v4.14 when the ipc compat code was refactored to move (commits 553f770ef71b, 469391684626, c0ebccb6fa1e). Although it is most likely a kernel issue, it was shown only due BZ#18231 fix which made all the SysVIPC mode_t 32-bit regardless of the kABI. This patch fixes it by explicitly zeroing the upper bits for such cases. The __ASSUME_SYSVIPC_BROKEN_MODE_T case already handles it with the shift. (The aarch64 ipc_priv.h is superflous since __ASSUME_SYSVIPC_DEFAULT_IPC_64 is now defined as default). Checked on i686-linux-gnu on 3.10 and on 4.15 kernel. (cherry picked from commit 82025bad80429c67a4d75f098155b5e02b5112b4) --- sysdeps/unix/sysv/linux/msgctl.c | 9 +++++++-- sysdeps/unix/sysv/linux/semctl.c | 9 +++++++-- sysdeps/unix/sysv/linux/shmctl.c | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index 27879e76cd..eb28835b3a 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c +++ b/sysdeps/unix/sysv/linux/msgctl.c @@ -61,7 +61,6 @@ __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) int ret = msgctl_syscall (msqid, cmd, buf); -#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T if (ret >= 0) { switch (cmd) @@ -69,10 +68,16 @@ __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) case IPC_STAT: case MSG_STAT: case MSG_STAT_ANY: +#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T buf->msg_perm.mode >>= 16; +#else + /* Old Linux kernel versions might not clear the mode padding. */ + if (sizeof ((struct msqid_ds){0}.msg_perm.mode) + != sizeof (__kernel_mode_t)) + buf->msg_perm.mode &= 0xFFFF; +#endif } } -#endif return ret; } diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 0c3eb0932f..0a79e8e4f5 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -92,7 +92,6 @@ __new_semctl (int semid, int semnum, int cmd, ...) int ret = semctl_syscall (semid, semnum, cmd, arg); -#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T if (ret >= 0) { switch (cmd) @@ -100,10 +99,16 @@ __new_semctl (int semid, int semnum, int cmd, ...) case IPC_STAT: case SEM_STAT: case SEM_STAT_ANY: +#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T arg.buf->sem_perm.mode >>= 16; +#else + /* Old Linux kernel versions might not clear the mode padding. */ + if (sizeof ((struct semid_ds){0}.sem_perm.mode) + != sizeof (__kernel_mode_t)) + arg.buf->sem_perm.mode &= 0xFFFF; +#endif } } -#endif return ret; } diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 39fa861e17..aed9e5260e 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -63,7 +63,6 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) int ret = shmctl_syscall (shmid, cmd, buf); -#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T if (ret >= 0) { switch (cmd) @@ -71,10 +70,16 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) case IPC_STAT: case SHM_STAT: case SHM_STAT_ANY: +#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T buf->shm_perm.mode >>= 16; +#else + /* Old Linux kernel versions might not clear the mode padding. */ + if (sizeof ((struct shmid_ds){0}.shm_perm.mode) + != sizeof (__kernel_mode_t)) + buf->shm_perm.mode &= 0xFFFF; +#endif } } -#endif return ret; } -- 2.17.1