Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxptp for openSUSE:Factory
checked in at 2021-07-08 22:49:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxptp (Old)
and /work/SRC/openSUSE:Factory/.linuxptp.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxptp"
Thu Jul 8 22:49:17 2021 rev:8 rq:904720 version:3.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxptp/linuxptp.changes 2020-11-11
20:47:25.903705568 +0100
+++ /work/SRC/openSUSE:Factory/.linuxptp.new.2625/linuxptp.changes
2021-07-08 22:49:37.107913695 +0200
@@ -1,0 +2,8 @@
+Tue Jul 06 08:06:16 UTC 2021 - jbo...@suse.com
+
+- Update to version 3.1.1:
+ * Version 3.1.1
+ * tc: Fix length of follow-up message of one-step sync.
+ * Validate the messageLength field of incoming messages.
+
+-------------------------------------------------------------------
Old:
----
linuxptp-3.1.tar.xz
New:
----
linuxptp-3.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxptp.spec ++++++
--- /var/tmp/diff_new_pack.9SCbQt/_old 2021-07-08 22:49:37.543910331 +0200
+++ /var/tmp/diff_new_pack.9SCbQt/_new 2021-07-08 22:49:37.543910331 +0200
@@ -1,7 +1,7 @@
#
# spec file for package linuxptp
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: linuxptp
-Version: 3.1
+Version: 3.1.1
Release: 0
Summary: Precision Time Protocol v2 daemon
License: GPL-2.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.9SCbQt/_old 2021-07-08 22:49:37.575910084 +0200
+++ /var/tmp/diff_new_pack.9SCbQt/_new 2021-07-08 22:49:37.575910084 +0200
@@ -2,7 +2,7 @@
<service mode="localonly" name="tar_scm">
<param name="url">git://git.code.sf.net/p/linuxptp/code</param>
<param name="scm">git</param>
- <param name="revision">v3.1</param>
+ <param name="revision">v3.1.1</param>
<param name="changesgenerate">enable</param>
<param name="filename">linuxptp</param>
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.g%h</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9SCbQt/_old 2021-07-08 22:49:37.591909961 +0200
+++ /var/tmp/diff_new_pack.9SCbQt/_new 2021-07-08 22:49:37.591909961 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://git.code.sf.net/p/linuxptp/code</param>
- <param
name="changesrevision">38ad3264f8726691c3fd0c97d0b34c8eee80c11b</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">6feb76186ac39eab2fc011053f1cf46bfc94c8e4</param></service></servicedata>
\ No newline at end of file
++++++ linuxptp-3.1.tar.xz -> linuxptp-3.1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxptp-3.1/msg.c new/linuxptp-3.1.1/msg.c
--- old/linuxptp-3.1/msg.c 2020-09-25 18:15:43.000000000 +0200
+++ new/linuxptp-3.1.1/msg.c 2021-07-05 03:51:59.000000000 +0200
@@ -186,7 +186,7 @@
{
uint8_t *ptr = msg_suffix(msg);
struct tlv_extra *extra;
- int err;
+ int err, suffix_len = 0;
if (!ptr)
return 0;
@@ -204,12 +204,14 @@
tlv_extra_recycle(extra);
return -EBADMSG;
}
+ suffix_len += sizeof(struct TLV);
len -= sizeof(struct TLV);
ptr += sizeof(struct TLV);
if (extra->tlv->length > len) {
tlv_extra_recycle(extra);
return -EBADMSG;
}
+ suffix_len += extra->tlv->length;
len -= extra->tlv->length;
ptr += extra->tlv->length;
err = tlv_post_recv(extra);
@@ -219,7 +221,7 @@
}
msg_tlv_attach(msg, extra);
}
- return 0;
+ return suffix_len;
}
static void suffix_pre_send(struct ptp_message *msg)
@@ -337,7 +339,7 @@
int msg_post_recv(struct ptp_message *m, int cnt)
{
- int pdulen, type, err;
+ int err, pdulen, suffix_len, type;
if (cnt < sizeof(struct ptp_header))
return -EBADMSG;
@@ -422,9 +424,13 @@
break;
}
- err = suffix_post_recv(m, cnt - pdulen);
- if (err)
- return err;
+ suffix_len = suffix_post_recv(m, cnt - pdulen);
+ if (suffix_len < 0) {
+ return suffix_len;
+ }
+ if (pdulen + suffix_len != m->header.messageLength) {
+ return -EBADMSG;
+ }
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxptp-3.1/tc.c new/linuxptp-3.1.1/tc.c
--- old/linuxptp-3.1/tc.c 2020-09-25 18:15:43.000000000 +0200
+++ new/linuxptp-3.1.1/tc.c 2021-07-05 03:51:59.000000000 +0200
@@ -452,7 +452,7 @@
}
fup->header.tsmt = FOLLOW_UP | (msg->header.tsmt
& 0xf0);
fup->header.ver = msg->header.ver;
- fup->header.messageLength = sizeof(struct follow_up_msg);
+ fup->header.messageLength = htons(sizeof(struct
follow_up_msg));
fup->header.domainNumber = msg->header.domainNumber;
fup->header.sourcePortIdentity = msg->header.sourcePortIdentity;
fup->header.sequenceId = msg->header.sequenceId;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxptp-3.1/version.sh new/linuxptp-3.1.1/version.sh
--- old/linuxptp-3.1/version.sh 2020-09-25 18:15:43.000000000 +0200
+++ new/linuxptp-3.1.1/version.sh 2021-07-05 03:51:59.000000000 +0200
@@ -6,7 +6,7 @@
#
major=3
minor=1
-extra=
+extra=.1
usage() {
echo "Usage: $0 [srctree]" >&2
