Skip to content

Commit bee4390

Browse files
Stanislav Kinsburskiipmladek
authored andcommitted
printk: Remove obsoleted check for non-existent "user" object
The original check for non-null "user" object was introduced by commit e11fea9 ("kmsg: export printk records to the /dev/kmsg interface") when "user" could be NULL if /dev/ksmg was opened for writing. Subsequent change 750afe7 ("printk: add kernel parameter to control writes to /dev/kmsg") made "user" context required for files opened for write, but didn't remove now redundant checks for it to be non-NULL. This patch removes the dead code while preserving the current logic. Signed-off-by: Stanislav Kinsburskii <stanislav.kinsburski@gmail.com> CC: Petr Mladek <pmladek@suse.com> CC: Sergey Senozhatsky <senozhatsky@chromium.org> CC: Steven Rostedt <rostedt@goodmis.org> CC: John Ogness <john.ogness@linutronix.de> CC: linux-kernel@vger.kernel.org Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Reviewed-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/167929571877.2810.9926967619100618792.stgit@skinsburskii.localdomain
1 parent 48e1a66 commit bee4390

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

kernel/printk/printk.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from)
730730
size_t len = iov_iter_count(from);
731731
ssize_t ret = len;
732732

733-
if (!user || len > PRINTKRB_RECORD_MAX)
733+
if (len > PRINTKRB_RECORD_MAX)
734734
return -EINVAL;
735735

736736
/* Ignore when user logging is disabled. */
@@ -792,9 +792,6 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf,
792792
};
793793
ssize_t ret;
794794

795-
if (!user)
796-
return -EBADF;
797-
798795
ret = mutex_lock_interruptible(&user->lock);
799796
if (ret)
800797
return ret;
@@ -859,8 +856,6 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence)
859856
struct devkmsg_user *user = file->private_data;
860857
loff_t ret = 0;
861858

862-
if (!user)
863-
return -EBADF;
864859
if (offset)
865860
return -ESPIPE;
866861

@@ -893,9 +888,6 @@ static __poll_t devkmsg_poll(struct file *file, poll_table *wait)
893888
struct printk_info info;
894889
__poll_t ret = 0;
895890

896-
if (!user)
897-
return EPOLLERR|EPOLLNVAL;
898-
899891
poll_wait(file, &log_wait, wait);
900892

901893
if (prb_read_valid_info(prb, atomic64_read(&user->seq), &info, NULL)) {
@@ -944,9 +936,6 @@ static int devkmsg_release(struct inode *inode, struct file *file)
944936
{
945937
struct devkmsg_user *user = file->private_data;
946938

947-
if (!user)
948-
return 0;
949-
950939
ratelimit_state_exit(&user->rs);
951940

952941
mutex_destroy(&user->lock);

0 commit comments

Comments
 (0)