Annotation of /trunk/kernel-lts/patches-3.4/0152-3.4.53-all-fixes.patch
Parent Directory | Revision Log
Revision 2239 -
(hide annotations)
(download)
Mon Jul 15 12:13:53 2013 UTC (11 years, 2 months ago) by niro
File size: 6960 byte(s)
Mon Jul 15 12:13:53 2013 UTC (11 years, 2 months ago) by niro
File size: 6960 byte(s)
-linux-3.4.53
1 | niro | 2239 | diff --git a/MAINTAINERS b/MAINTAINERS |
2 | index c744d9c..5725829 100644 | ||
3 | --- a/MAINTAINERS | ||
4 | +++ b/MAINTAINERS | ||
5 | @@ -6390,6 +6390,7 @@ STABLE BRANCH | ||
6 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
7 | L: stable@vger.kernel.org | ||
8 | S: Supported | ||
9 | +F: Documentation/stable_kernel_rules.txt | ||
10 | |||
11 | STAGING SUBSYSTEM | ||
12 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
13 | diff --git a/block/genhd.c b/block/genhd.c | ||
14 | index 60108d9..d815a0f 100644 | ||
15 | --- a/block/genhd.c | ||
16 | +++ b/block/genhd.c | ||
17 | @@ -518,7 +518,7 @@ static void register_disk(struct gendisk *disk) | ||
18 | |||
19 | ddev->parent = disk->driverfs_dev; | ||
20 | |||
21 | - dev_set_name(ddev, disk->disk_name); | ||
22 | + dev_set_name(ddev, "%s", disk->disk_name); | ||
23 | |||
24 | /* delay uevents, until we scanned partition table */ | ||
25 | dev_set_uevent_suppress(ddev, 1); | ||
26 | diff --git a/crypto/algapi.c b/crypto/algapi.c | ||
27 | index 056571b..b4c046c 100644 | ||
28 | --- a/crypto/algapi.c | ||
29 | +++ b/crypto/algapi.c | ||
30 | @@ -512,7 +512,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name) | ||
31 | |||
32 | struct crypto_template *crypto_lookup_template(const char *name) | ||
33 | { | ||
34 | - return try_then_request_module(__crypto_lookup_template(name), name); | ||
35 | + return try_then_request_module(__crypto_lookup_template(name), "%s", | ||
36 | + name); | ||
37 | } | ||
38 | EXPORT_SYMBOL_GPL(crypto_lookup_template); | ||
39 | |||
40 | diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c | ||
41 | index 3c4c225..386d40e 100644 | ||
42 | --- a/drivers/block/nbd.c | ||
43 | +++ b/drivers/block/nbd.c | ||
44 | @@ -666,7 +666,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, | ||
45 | |||
46 | mutex_unlock(&nbd->tx_lock); | ||
47 | |||
48 | - thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name); | ||
49 | + thread = kthread_create(nbd_thread, nbd, "%s", | ||
50 | + nbd->disk->disk_name); | ||
51 | if (IS_ERR(thread)) { | ||
52 | mutex_lock(&nbd->tx_lock); | ||
53 | return PTR_ERR(thread); | ||
54 | diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c | ||
55 | index d620b44..8a3aff7 100644 | ||
56 | --- a/drivers/cdrom/cdrom.c | ||
57 | +++ b/drivers/cdrom/cdrom.c | ||
58 | @@ -2882,7 +2882,7 @@ static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi, | ||
59 | if (lba < 0) | ||
60 | return -EINVAL; | ||
61 | |||
62 | - cgc->buffer = kmalloc(blocksize, GFP_KERNEL); | ||
63 | + cgc->buffer = kzalloc(blocksize, GFP_KERNEL); | ||
64 | if (cgc->buffer == NULL) | ||
65 | return -ENOMEM; | ||
66 | |||
67 | diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c | ||
68 | index 9eca9f1..4c449b2 100644 | ||
69 | --- a/drivers/power/charger-manager.c | ||
70 | +++ b/drivers/power/charger-manager.c | ||
71 | @@ -330,7 +330,7 @@ static void uevent_notify(struct charger_manager *cm, const char *event) | ||
72 | strncpy(env_str, event, UEVENT_BUF_SIZE); | ||
73 | kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE); | ||
74 | |||
75 | - dev_info(cm->dev, event); | ||
76 | + dev_info(cm->dev, "%s", event); | ||
77 | } | ||
78 | |||
79 | /** | ||
80 | diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c | ||
81 | index d4ed9eb..caac1b2 100644 | ||
82 | --- a/drivers/scsi/osd/osd_uld.c | ||
83 | +++ b/drivers/scsi/osd/osd_uld.c | ||
84 | @@ -465,7 +465,7 @@ static int osd_probe(struct device *dev) | ||
85 | oud->class_dev.class = &osd_uld_class; | ||
86 | oud->class_dev.parent = dev; | ||
87 | oud->class_dev.release = __remove; | ||
88 | - error = dev_set_name(&oud->class_dev, disk->disk_name); | ||
89 | + error = dev_set_name(&oud->class_dev, "%s", disk->disk_name); | ||
90 | if (error) { | ||
91 | OSD_ERR("dev_set_name failed => %d\n", error); | ||
92 | goto err_put_cdev; | ||
93 | diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c | ||
94 | index 2bbb845..3141c1a 100644 | ||
95 | --- a/drivers/scsi/sd.c | ||
96 | +++ b/drivers/scsi/sd.c | ||
97 | @@ -140,7 +140,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr, | ||
98 | char *buffer_data; | ||
99 | struct scsi_mode_data data; | ||
100 | struct scsi_sense_hdr sshdr; | ||
101 | - const char *temp = "temporary "; | ||
102 | + static const char temp[] = "temporary "; | ||
103 | int len; | ||
104 | |||
105 | if (sdp->type != TYPE_DISK) | ||
106 | diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c | ||
107 | index ffba1ef..40747fe 100644 | ||
108 | --- a/drivers/tty/serial/8250/8250_pci.c | ||
109 | +++ b/drivers/tty/serial/8250/8250_pci.c | ||
110 | @@ -4086,10 +4086,6 @@ static struct pci_device_id serial_pci_tbl[] = { | ||
111 | PCI_VENDOR_ID_IBM, 0x0299, | ||
112 | 0, 0, pbn_b0_bt_2_115200 }, | ||
113 | |||
114 | - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, | ||
115 | - 0x1000, 0x0012, | ||
116 | - 0, 0, pbn_b0_bt_2_115200 }, | ||
117 | - | ||
118 | { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901, | ||
119 | 0xA000, 0x1000, | ||
120 | 0, 0, pbn_b0_1_115200 }, | ||
121 | diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c | ||
122 | index a790821..ea3d1ca 100644 | ||
123 | --- a/fs/hpfs/map.c | ||
124 | +++ b/fs/hpfs/map.c | ||
125 | @@ -17,7 +17,8 @@ unsigned int *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block, | ||
126 | struct quad_buffer_head *qbh, char *id) | ||
127 | { | ||
128 | secno sec; | ||
129 | - if (hpfs_sb(s)->sb_chk) if (bmp_block * 16384 > hpfs_sb(s)->sb_fs_size) { | ||
130 | + unsigned n_bands = (hpfs_sb(s)->sb_fs_size + 0x3fff) >> 14; | ||
131 | + if (hpfs_sb(s)->sb_chk) if (bmp_block >= n_bands) { | ||
132 | hpfs_error(s, "hpfs_map_bitmap called with bad parameter: %08x at %s", bmp_block, id); | ||
133 | return NULL; | ||
134 | } | ||
135 | diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c | ||
136 | index 54f6ecc..0bf578d 100644 | ||
137 | --- a/fs/hpfs/super.c | ||
138 | +++ b/fs/hpfs/super.c | ||
139 | @@ -552,7 +552,13 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) | ||
140 | sbi->sb_cp_table = NULL; | ||
141 | sbi->sb_c_bitmap = -1; | ||
142 | sbi->sb_max_fwd_alloc = 0xffffff; | ||
143 | - | ||
144 | + | ||
145 | + if (sbi->sb_fs_size >= 0x80000000) { | ||
146 | + hpfs_error(s, "invalid size in superblock: %08x", | ||
147 | + (unsigned)sbi->sb_fs_size); | ||
148 | + goto bail4; | ||
149 | + } | ||
150 | + | ||
151 | /* Load bitmap directory */ | ||
152 | if (!(sbi->sb_bmp_dir = hpfs_load_bitmap_directory(s, le32_to_cpu(superblock->bitmaps)))) | ||
153 | goto bail4; | ||
154 | diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c | ||
155 | index 1798846..cb997b1 100644 | ||
156 | --- a/fs/nfsd/nfs4xdr.c | ||
157 | +++ b/fs/nfsd/nfs4xdr.c | ||
158 | @@ -161,8 +161,8 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) | ||
159 | */ | ||
160 | memcpy(p, argp->p, avail); | ||
161 | /* step to next page */ | ||
162 | - argp->p = page_address(argp->pagelist[0]); | ||
163 | argp->pagelist++; | ||
164 | + argp->p = page_address(argp->pagelist[0]); | ||
165 | if (argp->pagelen < PAGE_SIZE) { | ||
166 | argp->end = argp->p + (argp->pagelen>>2); | ||
167 | argp->pagelen = 0; | ||
168 | diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c | ||
169 | index 6570548..a1e0795 100644 | ||
170 | --- a/kernel/time/tick-sched.c | ||
171 | +++ b/kernel/time/tick-sched.c | ||
172 | @@ -145,7 +145,6 @@ static void tick_nohz_update_jiffies(ktime_t now) | ||
173 | tick_do_update_jiffies64(now); | ||
174 | local_irq_restore(flags); | ||
175 | |||
176 | - calc_load_exit_idle(); | ||
177 | touch_softlockup_watchdog(); | ||
178 | } | ||
179 | |||
180 | diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c | ||
181 | index 925ca58..8c93fa8 100644 | ||
182 | --- a/net/ceph/auth_none.c | ||
183 | +++ b/net/ceph/auth_none.c | ||
184 | @@ -39,6 +39,11 @@ static int should_authenticate(struct ceph_auth_client *ac) | ||
185 | return xi->starting; | ||
186 | } | ||
187 | |||
188 | +static int build_request(struct ceph_auth_client *ac, void *buf, void *end) | ||
189 | +{ | ||
190 | + return 0; | ||
191 | +} | ||
192 | + | ||
193 | /* | ||
194 | * the generic auth code decode the global_id, and we carry no actual | ||
195 | * authenticate state, so nothing happens here. | ||
196 | @@ -106,6 +111,7 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = { | ||
197 | .destroy = destroy, | ||
198 | .is_authenticated = is_authenticated, | ||
199 | .should_authenticate = should_authenticate, | ||
200 | + .build_request = build_request, | ||
201 | .handle_reply = handle_reply, | ||
202 | .create_authorizer = ceph_auth_none_create_authorizer, | ||
203 | .destroy_authorizer = ceph_auth_none_destroy_authorizer, |