gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages.amneziawg: 1.0.20260725 -> 3.0.20260731-02

Browse Source 
Diff: https://github.com/amnezia-vpn/amneziawg-linux-kernel-module/compare/v1.0.20260725...v3.0.20260731-02
This commit is contained in:
K900
2026-07-31 13:22:24 +03:00
parent fb431ae589
commit 296675a1f0
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/amneziawg/default.nix
+3 -2
View File
@@ -9,16 +9,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "amneziawg";
version = "1.0.20260725";
version = "3.0.20260731-02";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amneziawg-linux-kernel-module";
tag = "v${finalAttrs.version}";
hash = "sha256-7tfiZa5K80fmE27rwXtfMvbjUqd3+Q1w2ItAU4YrpFw=";
hash = "sha256-WlwOBRf8FsfS08NrLCRjo6GZ/ufd0QE2JKTurTf9nt0=";
};
patches = [
# Compatibility fixes for kernel 7.1.5+, 7.2
# Submitted upstream: https://github.com/amnezia-vpn/amneziawg-linux-kernel-module/pull/194
./sk-715.patch
];
pkgs/os-specific/linux/amneziawg/sk-715.patch
+33 -13
View File
@@ -1,15 +1,9 @@
commit 9ec3a508c89a9929c0d6d7348402ec67a57593bf
Author: K900 <me@0upti.me>
Date: 2026-07-26 21:39:56 +0300
socket, compat: fix build with kernel 7.1.5+
diff --git a/compat/compat.h b/compat/compat.h
index e362198..8696643 100644
index 3be1113..1e6a9f1 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -1415,4 +1415,15 @@ static inline struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struc
}
@@ -1444,4 +1444,15 @@ static inline void __compat_chacha20_crypt(struct chacha_state *state,
#endif
+/*
@@ -24,11 +18,37 @@ index e362198..8696643 100644
+#endif
+
#endif /* _WG_COMPAT_H */
diff --git a/netlink.c b/netlink.c
index f2c79b6..1f18583 100644
--- a/netlink.c
+++ b/netlink.c
@@ -170,8 +170,8 @@ static inline int parse_ipv4_prefix(const char *prefix_str, struct ipv4_prefix *
if (slash - prefix_str >= INET_ADDRSTRLEN)
return -EINVAL;
- strncpy(addr_str, prefix_str, slash - prefix_str);
- addr_str[slash - prefix_str] = '\0';
+ // strscpy count includes null terminator
+ strscpy(addr_str, prefix_str, slash - prefix_str + 1);
ret = kstrtoint(slash + 1, 10, &prefix->prefix_len);
if (ret < 0)
@@ -229,8 +229,8 @@ static inline int parse_ipv6_prefix(const char *prefix_str, struct ipv6_prefix *
if (slash - prefix_str >= INET6_ADDRSTRLEN)
return -EINVAL;
- strncpy(addr_str, prefix_str, slash - prefix_str);
- addr_str[slash - prefix_str] = '\0';
+ // strscpy count includes null terminator
+ strscpy(addr_str, prefix_str, slash - prefix_str + 1);
ret = kstrtoint(slash + 1, 10, &prefix->prefix_len);
if (ret < 0)
diff --git a/socket.c b/socket.c
index b4d38b1..0ce571c 100644
index d069e10..f267362 100644
--- a/socket.c
+++ b/socket.c
@@ -341,7 +341,7 @@ static void sock_free(struct sock *sock)
@@ -349,7 +349,7 @@ static void sock_free(struct sock *sock)
if (unlikely(!sock))
return;
sk_clear_memalloc(sock);
@@ -37,7 +57,7 @@ index b4d38b1..0ce571c 100644
}
static void set_sock_opts(struct socket *sock)
@@ -395,14 +395,14 @@ retry:
@@ -403,14 +403,14 @@ retry:
goto out;
}
set_sock_opts(new4);
@@ -54,7 +74,7 @@ index b4d38b1..0ce571c 100644
if (ret == -EADDRINUSE && !port && retries++ < 100)
goto retry;
pr_err("%s: Could not create IPv6 socket\n",
@@ -410,7 +410,7 @@ retry:
@@ -418,7 +418,7 @@ retry:
goto out;
}
set_sock_opts(new6);