github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nf: qtaguid: make procfs entry for ctrl return correct data.

Browse Source 
(This is a direct cherry-pick from 2.6.39: I3b925802)

Fixed procreader for /proc/net/xt_qtaguid/ctrl: it would just
fill the output with the same entry.
Simplify the **start handling.

Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: I3b92580228f2b57795bb2d0d6197fc95ab6be552
This commit is contained in:
JP Abgrall 2011-06-27 23:31:46 -07:00
parent 35b86285c2
commit c797ca58ff
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
net/netfilter/xt_qtaguid.c
View File

@ -906,42 +906,55 @@ static bool qtaguid_mt(const struct sk_buff *skb, struct xt_action_param *par)
return res;
}
/* TODO: Use Documentation/filesystems/seq_file.txt? */
static int qtaguid_ctrl_proc_read(char *page, char **start, off_t off,
int count, int *eof, void *data)
/*
* Procfs reader to get all active socket tags using style "1)" as described in
* fs/proc/generic.c
*/
static int qtaguid_ctrl_proc_read(char *page, char **num_items_returned,
off_t items_to_skip, int char_count, int *eof,
void *data)
{
char *out = page + off;
char *outp = page;
int len;
unsigned long flags;
uid_t uid;
struct sock_tag *sock_tag_entry;
struct rb_node *node;
pr_debug("xt_qtaguid:proc ctrl page=%p off=%ld count=%d eof=%p\n",
page, off, count, eof);
int item_index = 0;
pr_debug("xt_qtaguid:proc ctrl page=%p off=%ld char_count=%d *eof=%d\n",
page, items_to_skip, char_count, *eof);
if (*eof)
return 0;
*eof = 0;
spin_lock_irqsave(&sock_tag_list_lock, flags);
for (node = rb_first(&sock_tag_tree);
node;
node = rb_next(node)) {
if (item_index++ < items_to_skip)
continue;
sock_tag_entry = rb_entry(node, struct sock_tag, node);
uid = get_uid_from_tag(sock_tag_entry->tag);
pr_debug("xt_qtaguid: proc_read(): sk=%p tag=0x%llx (uid=%d)\n",
sock_tag_entry->sk,
sock_tag_entry->tag,
uid);
len = snprintf(out, count, "sock=%p tag=0x%llx (uid=%u)\n",
sock_tag_entry->sk, sock_tag_entry->tag, uid);
out += len;
count -= len;
if (!count) {
len = snprintf(outp, char_count,
"sock=%p tag=0x%llx (uid=%u)\n",
sock_tag_entry->sk, sock_tag_entry->tag, uid);
if (len >= char_count) {
spin_unlock_irqrestore(&sock_tag_list_lock, flags);
return out - page;
*outp = '\0';
return outp - page;
}
outp += len;
char_count -= len;
(*num_items_returned)++;
}
*eof = 1;
spin_unlock_irqrestore(&sock_tag_list_lock, flags);
return out - page;
*eof = 1;
return outp - page;
}
static int qtaguid_ctrl_parse(const char *input, int count)
@ -1146,7 +1159,7 @@ static int qtaguid_stats_proc_read(char *page, char **num_items_returned,
}
outp += len;
char_count -= len;
(*(int *)num_items_returned)++;
(*num_items_returned)++;
}
spin_unlock_irqrestore(&iface_entry->tag_stat_list_lock,
flags2);