Message ID | 20191209222325.95656-2-ebiggers@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ubifs: fixes for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS | expand |
On Mon, Dec 16, 2019 at 03:06:35PM +0000, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: d475a507457b ("ubifs: Add skeleton for fscrypto"). > > The bot has tested the following trees: v5.4.2, v5.3.15, v4.19.88, v4.14.158. > > v5.4.2: Build OK! > v5.3.15: Build OK! > v4.19.88: Build failed! Errors: > fs/ubifs/ioctl.c:130:28: error: ‘UBIFS_SUPPORTED_IOCTL_FLAGS’ undeclared (first use in this function) > > v4.14.158: Build failed! Errors: > fs/ubifs/ioctl.c:127:28: error: ‘UBIFS_SUPPORTED_IOCTL_FLAGS’ undeclared (first use in this function) > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? > 4.19 and 4.14 will build if you apply commit 2fe8b2d5578d ("ubifs: Reject unsupported ioctl flags explicitly") first. That was a bug fix too, so I recommend applying it. - Eric
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 5dc5abca11c70..eeb1be2598881 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -113,7 +113,8 @@ static int setflags(struct inode *inode, int flags) if (err) goto out_unlock; - ui->flags = ioctl2ubifs(flags); + ui->flags &= ~ioctl2ubifs(UBIFS_SUPPORTED_IOCTL_FLAGS); + ui->flags |= ioctl2ubifs(flags); ubifs_set_inode_flags(inode); inode->i_ctime = current_time(inode); release = ui->dirty;