mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
Merge branch 'gtp-simple-improvements'
Andreas Schultz says: ==================== gtp: simple gtp improvements This is the part of the previous "simple gtp improvements" series that Pablo indicated should go into net-next. The rcu_lock removal is small correctness changes. Passing invalid to user space allows for more standards compliant handling of invalid tunnels. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
c51dfff8eb
@ -183,7 +183,6 @@ static int gtp0_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb,
|
||||
sizeof(struct gtp0_header);
|
||||
struct gtp0_header *gtp0;
|
||||
struct pdp_ctx *pctx;
|
||||
int ret = 0;
|
||||
|
||||
if (!pskb_may_pull(skb, hdrlen))
|
||||
return -1;
|
||||
@ -196,26 +195,19 @@ static int gtp0_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb,
|
||||
if (gtp0->type != GTP_TPDU)
|
||||
return 1;
|
||||
|
||||
rcu_read_lock();
|
||||
pctx = gtp0_pdp_find(gtp, be64_to_cpu(gtp0->tid));
|
||||
if (!pctx) {
|
||||
netdev_dbg(gtp->dev, "No PDP ctx to decap skb=%p\n", skb);
|
||||
ret = -1;
|
||||
goto out_rcu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!gtp_check_src_ms(skb, pctx, hdrlen)) {
|
||||
netdev_dbg(gtp->dev, "No PDP ctx for this MS\n");
|
||||
ret = -1;
|
||||
goto out_rcu;
|
||||
return 1;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
/* Get rid of the GTP + UDP headers. */
|
||||
return iptunnel_pull_header(skb, hdrlen, skb->protocol, xnet);
|
||||
out_rcu:
|
||||
rcu_read_unlock();
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb,
|
||||
@ -225,7 +217,6 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb,
|
||||
sizeof(struct gtp1_header);
|
||||
struct gtp1_header *gtp1;
|
||||
struct pdp_ctx *pctx;
|
||||
int ret = 0;
|
||||
|
||||
if (!pskb_may_pull(skb, hdrlen))
|
||||
return -1;
|
||||
@ -253,26 +244,19 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb,
|
||||
|
||||
gtp1 = (struct gtp1_header *)(skb->data + sizeof(struct udphdr));
|
||||
|
||||
rcu_read_lock();
|
||||
pctx = gtp1_pdp_find(gtp, ntohl(gtp1->tid));
|
||||
if (!pctx) {
|
||||
netdev_dbg(gtp->dev, "No PDP ctx to decap skb=%p\n", skb);
|
||||
ret = -1;
|
||||
goto out_rcu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!gtp_check_src_ms(skb, pctx, hdrlen)) {
|
||||
netdev_dbg(gtp->dev, "No PDP ctx for this MS\n");
|
||||
ret = -1;
|
||||
goto out_rcu;
|
||||
return 1;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
/* Get rid of the GTP + UDP headers. */
|
||||
return iptunnel_pull_header(skb, hdrlen, skb->protocol, xnet);
|
||||
out_rcu:
|
||||
rcu_read_unlock();
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void gtp_encap_disable(struct gtp_dev *gtp)
|
||||
|
Loading…
Reference in New Issue
Block a user