History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says: ==================== pull request (net): ipsec 2022-08-24 1) Fix a refcount leak in __xfrm_policy_check. From Xin Xiong. 2) Revert "xfrm: update SA curlft.use_time". This violates RFC 2367. From Antony Antony. 3) Fix a comment on XFRMA_LASTUSED. From Antony Antony. 4) x->lastused is not cloned in xfrm_do_migrate. Fix from Antony Antony. 5) Serialize the calls to xfrm_probe_algs. From Herbert Xu. 6) Fix a null pointer dereference of dst->dev on a metadata dst in xfrm_lookup_with_ifid. From Nikolay Aleksandrov. Please pull or let me know if there are problems. ====================

David S. Miller committed 4 years ago

Commit 76de0082 parents f799592 17ecd4a6 files · +7 −4Browse files

Showing the changes to include/uapi (1 of 6 files). Show all

Unified · Split

include/uapi/linux/xfrm.h+1−1
@@ -296,7 +296,7 @@ enum xfrm_attr_type_t { · 295 unmodified lines
296296 XFRMA_ETIMER_THRESH,
297297 XFRMA_SRCADDR, /* xfrm_address_t */
298298 XFRMA_COADDR, /* xfrm_address_t */
299− XFRMA_LASTUSED, /* unsigned long */
299+ XFRMA_LASTUSED, /* __u64 */
300300 XFRMA_POLICY_TYPE, /* struct xfrm_userpolicy_type */
301301 XFRMA_MIGRATE,
302302 XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t