iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: netfilter: xt_qtaguid: 64-bit warning fixes

Browse Source 
Change-Id: I2adc517c0c51050ed601992fa0ea4de8f1449414
Signed-off-by: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
Greg Hackmann
2014-02-24 09:39:46 -08:00
committed by Dmitry Shmidt
parent 564729173b
commit 85a2eb5b48
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/netfilter/xt_qtaguid.c
View File

@ -594,7 +594,7 @@ static void put_tag_ref_tree(tag_t full_tag, struct uid_tag_data *utd_entry)
}
}
static int read_proc_u64(struct file *file, char __user *buf,
static ssize_t read_proc_u64(struct file *file, char __user *buf,
size_t size, loff_t *ppos)
{
uint64_t *valuep = PDE_DATA(file_inode(file));
@ -605,7 +605,7 @@ static int read_proc_u64(struct file *file, char __user *buf,
return simple_read_from_buffer(buf, size, ppos, tmp, tmp_size);
}
static int read_proc_bool(struct file *file, char __user *buf,
static ssize_t read_proc_bool(struct file *file, char __user *buf,
size_t size, loff_t *ppos)
{
bool *valuep = PDE_DATA(file_inode(file));
@ -1488,7 +1488,7 @@ static int proc_iface_stat_fmt_open(struct inode *inode, struct file *file)
if (!s)
return -ENOMEM;
s->fmt = (int)PDE_DATA(inode);
s->fmt = (uintptr_t)PDE_DATA(inode);
return 0;
}
@ -2440,10 +2440,10 @@ err:
return res;
}
static int qtaguid_ctrl_parse(const char *input, int count)
static ssize_t qtaguid_ctrl_parse(const char *input, size_t count)
{
char cmd;
int res;
ssize_t res;
CT_DEBUG("qtaguid: ctrl(%s): pid=%u tgid=%u uid=%u\n",
input, current->pid, current->tgid, current_fsuid());
@ -2474,12 +2474,12 @@ static int qtaguid_ctrl_parse(const char *input, int count)
if (!res)
res = count;
err:
CT_DEBUG("qtaguid: ctrl(%s): res=%d\n", input, res);
CT_DEBUG("qtaguid: ctrl(%s): res=%zd\n", input, res);
return res;
}
#define MAX_QTAGUID_CTRL_INPUT_LEN 255
static int qtaguid_ctrl_proc_write(struct file *file, const char __user *buffer,
static ssize_t qtaguid_ctrl_proc_write(struct file *file, const char __user *buffer,
size_t count, loff_t *offp)
{
char input_buf[MAX_QTAGUID_CTRL_INPUT_LEN];

4
net/netfilter/xt_quota2.c
View File

@ -122,7 +122,7 @@ static void quota2_log(unsigned int hooknum,
}
#endif /* if+else CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG */
static int quota_proc_read(struct file *file, char __user *buf,
static ssize_t quota_proc_read(struct file *file, char __user *buf,
size_t size, loff_t *ppos)
{
struct xt_quota_counter *e = PDE_DATA(file_inode(file));
@ -135,7 +135,7 @@ static int quota_proc_read(struct file *file, char __user *buf,
return simple_read_from_buffer(buf, size, ppos, tmp, tmp_size);
}
static int quota_proc_write(struct file *file, const char __user *input,
static ssize_t quota_proc_write(struct file *file, const char __user *input,
size_t size, loff_t *ppos)
{
struct xt_quota_counter *e = PDE_DATA(file_inode(file));