Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xt_coova: fix compile with kernel>=5.17 #564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xt_coova: fix compile with kernel>=5.17 #564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/linux/xt_coova.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,9 @@ static int coova_seq_open(struct inode *inode, struct file *file)
if (st == NULL)
return -ENOMEM;

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
st->table = pde_data(inode);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs an upper bound (before 5.17.0?)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking a look sevan.
I thought the upper bound would be guarded by the else in #elif, so any kernel at or after 5.17 would not reach this?

Cheers

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's more to protect against future edits, rather than compiling/parsing (at a glance to the human they both apply to 5.17, one just more so :) )

st->table = PDE_DATA(inode);
#else
st->table = pde->data;
Expand All @@ -479,7 +481,9 @@ static ssize_t
coova_mt_proc_write(struct file *file, const char __user *input,
size_t size, loff_t *loff)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
struct coova_table *t = pde_data(file_inode(file));
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, needs an upper bound (before 5.17.0?)

struct coova_table *t = PDE_DATA(file_inode(file));
#else
const struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
Expand Down