Run of fresh-snapshots for acpi-call
Merge these changes:
git pull https://janitor.debian.net/git/acpi-call fresh-snapshots/main
git pull https://janitor.debian.net/git/acpi-call fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/acpi-call fresh-snapshots/upstream
Summary
DEB_UPDATE_CHANGELOG=auto deb-new-upstream --snapshot --refresh-patchesDiff
Branch: main
diff --git a/acpi_call.c b/acpi_call.c
index 9fd9886..15ddc4e 100644
--- a/acpi_call.c
+++ b/acpi_call.c
@@ -24,7 +24,8 @@ MODULE_LICENSE("GPL");
#define DEBUG
*/
-#define BUFFER_SIZE 256
+#define BUFFER_SIZE 4096
+#define INPUT_BUFFER_SIZE (2 * BUFFER_SIZE)
#define MAX_ACPI_ARGS 16
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
@@ -33,6 +34,7 @@ MODULE_LICENSE("GPL");
extern struct proc_dir_entry *acpi_root_dir;
+static char input_buffer[INPUT_BUFFER_SIZE];
static char result_buffer[BUFFER_SIZE];
static char not_called_message[11] = "not called";
@@ -298,12 +300,12 @@ static int acpi_proc_write( struct file *filp, const char __user *buff,
unsigned long len, void *data )
#endif
{
- char input[2 * BUFFER_SIZE] = { '\0' };
union acpi_object *args;
int nargs, i;
char *method;
- if (len > sizeof(input) - 1) {
+ memset(input_buffer, 0, INPUT_BUFFER_SIZE);
+ if (len > sizeof(input_buffer) - 1) {
#ifdef HAVE_PROC_CREATE
printk(KERN_ERR "acpi_call: Input too long! (%zu)\n", len);
#else
@@ -312,14 +314,14 @@ static int acpi_proc_write( struct file *filp, const char __user *buff,
return -ENOSPC;
}
- if (copy_from_user( input, buff, len )) {
+ if (copy_from_user( input_buffer, buff, len )) {
return -EFAULT;
}
- input[len] = '\0';
- if (input[len-1] == '\n')
- input[len-1] = '\0';
+ input_buffer[len] = '\0';
+ if (input_buffer[len-1] == '\n')
+ input_buffer[len-1] = '\0';
- method = parse_acpi_args(input, &nargs, &args);
+ method = parse_acpi_args(input_buffer, &nargs, &args);
if (method) {
do_acpi_call(method, nargs, args);
if (args) {
diff --git a/debian/changelog b/debian/changelog
index 4fadcea..3bfb0be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+acpi-call (3.17+git20220719.1.5d37ce7-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 08 Feb 2023 11:32:05 -0000
+
acpi-call (1.2.2-2) unstable; urgency=medium
[ Raphaël Halimi ]
Branch: pristine-tar
diff --git a/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.delta b/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.delta
new file mode 100644
index 0000000..82e4796
Binary files /dev/null and b/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.delta differ
diff --git a/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.id b/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.id
new file mode 100644
index 0000000..2da688b
--- /dev/null
+++ b/acpi-call_3.17+git20220719.1.5d37ce7.orig.tar.gz.id
@@ -0,0 +1 @@
+3d990e8c4e99e9576d92967bf9bb68f4e945c287
Branch: upstream
Tag: upstream/3.17+git20220719.1.5d37ce7diff --git a/acpi_call.c b/acpi_call.c
index 9fd9886..15ddc4e 100644
--- a/acpi_call.c
+++ b/acpi_call.c
@@ -24,7 +24,8 @@ MODULE_LICENSE("GPL");
#define DEBUG
*/
-#define BUFFER_SIZE 256
+#define BUFFER_SIZE 4096
+#define INPUT_BUFFER_SIZE (2 * BUFFER_SIZE)
#define MAX_ACPI_ARGS 16
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
@@ -33,6 +34,7 @@ MODULE_LICENSE("GPL");
extern struct proc_dir_entry *acpi_root_dir;
+static char input_buffer[INPUT_BUFFER_SIZE];
static char result_buffer[BUFFER_SIZE];
static char not_called_message[11] = "not called";
@@ -298,12 +300,12 @@ static int acpi_proc_write( struct file *filp, const char __user *buff,
unsigned long len, void *data )
#endif
{
- char input[2 * BUFFER_SIZE] = { '\0' };
union acpi_object *args;
int nargs, i;
char *method;
- if (len > sizeof(input) - 1) {
+ memset(input_buffer, 0, INPUT_BUFFER_SIZE);
+ if (len > sizeof(input_buffer) - 1) {
#ifdef HAVE_PROC_CREATE
printk(KERN_ERR "acpi_call: Input too long! (%zu)\n", len);
#else
@@ -312,14 +314,14 @@ static int acpi_proc_write( struct file *filp, const char __user *buff,
return -ENOSPC;
}
- if (copy_from_user( input, buff, len )) {
+ if (copy_from_user( input_buffer, buff, len )) {
return -EFAULT;
}
- input[len] = '\0';
- if (input[len-1] == '\n')
- input[len-1] = '\0';
+ input_buffer[len] = '\0';
+ if (input_buffer[len-1] == '\n')
+ input_buffer[len-1] = '\0';
- method = parse_acpi_args(input, &nargs, &args);
+ method = parse_acpi_args(input_buffer, &nargs, &args);
if (method) {
do_acpi_call(method, nargs, args);
if (args) {
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/src/acpi-call-3.17+git20220719.1.5d37ce7/Makefile -rw-r--r-- root/root /usr/src/acpi-call-3.17+git20220719.1.5d37ce7/acpi_call.c -rw-r--r-- root/root /usr/src/acpi-call-3.17+git20220719.1.5d37ce7/dkms.conf
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/src/acpi-call-1.2.2/Makefile -rw-r--r-- root/root /usr/src/acpi-call-1.2.2/acpi_call.c -rw-r--r-- root/root /usr/src/acpi-call-1.2.2/dkms.conf
No differences were encountered in the control files
Publish History
- 2023-02-19T10:11: ( Success ) (requested by runner)
Resulting package
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots acpi-call-dkms
Lintian Result
- acpi-call-dkms_3.17+git20220719.1.5d37ce7-1~jan+nus1_all.deb
- acpi-call_3.17+git20220719.1.5d37ce7-1~jan+nus1.dsc
- acpi-call_3.17+git20220719.1.5d37ce7-1~jan+nus1_amd64.buildinfo
- acpi-call_3.17+git20220719.1.5d37ce7-1~jan+nus1_amd64.changes
Reviews
Reviewer | Verdict | Comment |
---|---|---|
isomer@gmail.com | approved |