Skip to content

[ciqlts9_2] Multiple patches tested (2 commits) #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 2 commits into from
Aug 5, 2026
+7 −3
Merged

[ciqlts9_2] Multiple patches tested (2 commits) #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c73ec88
net: sched: act_csum: validate nested VLAN headers
Aug 5, 2026
dd98e93
drm/gem: Fix inconsistent plane dimension calculation in drm_gem_fb_i…
Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_gem_framebuffer_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
}

for (i = 0; i < info->num_planes; i++) {
unsigned int width = mode_cmd->width / (i ? info->hsub : 1);
unsigned int height = mode_cmd->height / (i ? info->vsub : 1);
unsigned int width = drm_format_info_plane_width(info, mode_cmd->width, i);
unsigned int height = drm_format_info_plane_height(info, mode_cmd->height, i);
unsigned int min_size;

objs[i] = drm_gem_object_lookup(file, mode_cmd->handles[i]);
Expand Down
6 changes: 5 additions & 1 deletion net/sched/act_csum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,12 @@ static int tcf_csum_act(struct sk_buff *skb, const struct tc_action *a,
protocol = skb->protocol;
orig_vlan_tag_present = true;
} else {
struct vlan_hdr *vlan = (struct vlan_hdr *)skb->data;
struct vlan_hdr *vlan;

if (!pskb_may_pull(skb, VLAN_HLEN))
goto drop;

vlan = (struct vlan_hdr *)skb->data;
protocol = vlan->h_vlan_encapsulated_proto;
skb_pull(skb, VLAN_HLEN);
skb_reset_network_header(skb);
Expand Down
Loading