diff --git a/Makefile.rhelver b/Makefile.rhelver index 5b8f34d3c0..d655a89873 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 10 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 553.147.1 +RHEL_RELEASE = 553.148.1 # # ZSTREAM diff --git a/kernel.sbat b/kernel.sbat index e8ba533842..52a8bfd3e2 100644 --- a/kernel.sbat +++ b/kernel.sbat @@ -1,2 +1,2 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -kernel.centos,1,Red Hat,kernel-core,4.18.0-553.147.1.el8.x86_64,mailto:secalert@redhat.com +kernel.centos,1,Red Hat,kernel-core,4.18.0-553.148.1.el8.x86_64,mailto:secalert@redhat.com diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 9b6ec362a7..f638a9b6ec 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -822,7 +822,6 @@ static int icmpv6_rcv(struct sk_buff *skb) enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED; struct net_device *dev = skb->dev; struct inet6_dev *idev = __in6_dev_get(dev); - const struct in6_addr *saddr, *daddr; struct icmp6hdr *hdr; u8 type; @@ -853,12 +852,10 @@ static int icmpv6_rcv(struct sk_buff *skb) __ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INMSGS); - saddr = &ipv6_hdr(skb)->saddr; - daddr = &ipv6_hdr(skb)->daddr; - if (skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo)) { net_dbg_ratelimited("ICMPv6 checksum failed [%pI6c > %pI6c]\n", - saddr, daddr); + &ipv6_hdr(skb)->saddr, + &ipv6_hdr(skb)->daddr); goto csum_error; } @@ -931,7 +928,8 @@ static int icmpv6_rcv(struct sk_buff *skb) break; net_dbg_ratelimited("icmpv6: msg of unknown type [%pI6c > %pI6c]\n", - saddr, daddr); + &ipv6_hdr(skb)->saddr, + &ipv6_hdr(skb)->daddr); /* * error of unknown type.