Skip to contentSkip to conversation

net: filter: replace sk_run_filter with __bpf_prog_run in comments

PATCH In review [email protected] 2 participants 2 messages Oct 10, 2014

Subsystems (4)
Networking Network drivers BPF BPF networking
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 net: filter: replace sk_run_filter with __bpf_prog_run in comments

From: Li RongQing <[email protected]>

sk_run_filter has been renamed as __bpf_prog_run, so replace them in comments

Signed-off-by Li RongQing <[email protected]>
---
 net/core/filter.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/filter.c +4 -4
index fcd3f67..9324601 100644
@@ -51,9 +51,9 @@
  *	@skb: buffer to filter
  *
  * Run the filter code and then cut skb->data to correct size returned by
- * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller
+ * __bpf_prog_run. If pkt_len is 0 we toss packet. If skb->len is smaller
  * than pkt_len we keep whole skb->data. This is the socket level
- * wrapper to sk_run_filter. It returns 0 if the packet should
+ * wrapper to __bpf_prog_run. It returns 0 if the packet should
  * be accepted or -EPERM if the packet should be tossed.
  *
  */

@@ -567,10 +567,10 @@ err:
 /* Security:
  *
  * A BPF program is able to use 16 cells of memory to store intermediate
- * values (check u32 mem[BPF_MEMWORDS] in sk_run_filter()).
+ * values (check u32 mem[BPF_MEMWORDS] in __bpf_prog_run()).
  *
  * As we dont want to clear mem[] array for each packet going through
- * sk_run_filter(), we check that filter loaded by user never try to read
+ * __bpf_prog_run(), we check that filter loaded by user never try to read
  * a cell if not previously written, and we check all branches to be sure
  * a malicious user doesn't try to abuse us.
  */
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 14 lines · On Thu, Oct 9, 2014 at 8:37 PM, <[email protected]> wrote:

From: Li RongQing <[email protected]>

sk_run_filter has been renamed as __bpf_prog_run, so replace them in comments

Signed-off-by Li RongQing <[email protected]>
---
 net/core/filter.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/filter.c +0 -0
index fcd3f67..9324601 100644

net/core/filter.c line 57

Quoted 9 lines
net/core/filter.c +2 -2
@@ -51,9 +51,9 @@
  *     @skb: buffer to filter
  *
  * Run the filter code and then cut skb->data to correct size returned by
- * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller
+ * __bpf_prog_run. If pkt_len is 0 we toss packet. If skb->len is smaller
  * than pkt_len we keep whole skb->data. This is the socket level
- * wrapper to sk_run_filter. It returns 0 if the packet should
+ * wrapper to __bpf_prog_run. It returns 0 if the packet should
  * be accepted or -EPERM if the packet should be tossed.

not quite. I think in both of the above lines it's better to replace sk_run_filter with SK_RUN_FILTER

net/core/filter.c err: · line 570

Quoted 8 lines
net/core/filter.c +1 -1
  *
  */

@@ -567,10 +567,10 @@ err:
 /* Security:
  *
  * A BPF program is able to use 16 cells of memory to store intermediate
- * values (check u32 mem[BPF_MEMWORDS] in sk_run_filter()).
+ * values (check u32 mem[BPF_MEMWORDS] in __bpf_prog_run()).

this just wrong. Better to remove this line.

net/core/filter.c err: · line 573

Quoted 4 lines
net/core/filter.c +1 -1
  *
  * As we dont want to clear mem[] array for each packet going through
- * sk_run_filter(), we check that filter loaded by user never try to read
+ * __bpf_prog_run(), we check that filter loaded by user never try to read

here the change is fine.