| Message ID | 20220414135902.100914-3-liujian56@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Enlarge offset check value in bpf_skb_load_bytes | expand |
> On Apr 14, 2022, at 6:59 AM, Liu Jian <liujian56@huawei.com> wrote: > > Both pskb_may_pull() and skb_clone_writable()'s length parameters are of > type unsigned int already. > Therefore, change this function's write_len param to unsigned int type. > > Signed-off-by: Liu Jian <liujian56@huawei.com> Acked-by: Song Liu <songliubraving@fb.com> > --- > include/linux/skbuff.h | 2 +- > net/core/skbuff.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index 3a30cae8b0a5..fe8990ce52a8 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -3886,7 +3886,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features); > struct sk_buff *skb_segment_list(struct sk_buff *skb, netdev_features_t features, > unsigned int offset); > struct sk_buff *skb_vlan_untag(struct sk_buff *skb); > -int skb_ensure_writable(struct sk_buff *skb, int write_len); > +int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len); > int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci); > int skb_vlan_pop(struct sk_buff *skb); > int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci); > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > index 30b523fa4ad2..a84e00e44ad2 100644 > --- a/net/core/skbuff.c > +++ b/net/core/skbuff.c > @@ -5601,7 +5601,7 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb) > } > EXPORT_SYMBOL(skb_vlan_untag); > > -int skb_ensure_writable(struct sk_buff *skb, int write_len) > +int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len) > { > if (!pskb_may_pull(skb, write_len)) > return -ENOMEM; > -- > 2.17.1 >
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 3a30cae8b0a5..fe8990ce52a8 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3886,7 +3886,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features); struct sk_buff *skb_segment_list(struct sk_buff *skb, netdev_features_t features, unsigned int offset); struct sk_buff *skb_vlan_untag(struct sk_buff *skb); -int skb_ensure_writable(struct sk_buff *skb, int write_len); +int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len); int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci); int skb_vlan_pop(struct sk_buff *skb); int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 30b523fa4ad2..a84e00e44ad2 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5601,7 +5601,7 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb) } EXPORT_SYMBOL(skb_vlan_untag); -int skb_ensure_writable(struct sk_buff *skb, int write_len) +int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len) { if (!pskb_may_pull(skb, write_len)) return -ENOMEM;
Both pskb_may_pull() and skb_clone_writable()'s length parameters are of type unsigned int already. Therefore, change this function's write_len param to unsigned int type. Signed-off-by: Liu Jian <liujian56@huawei.com> --- include/linux/skbuff.h | 2 +- net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)